From 5b0c3258f6abb32ab52ca629c9e5351da0ff5e0a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 18 Jan 2019 20:26:16 +0000 Subject: [PATCH] debian/rules.d: Delete now-unused recursive makefiles Since commit f5f169ba999c "Split build rules for tools to allow skipping them." these recursive makefiles are not used. (debian/rules.d/Makefile can additionally install the top-level Kbuild and Makefile, but that target hasn't been used since svn rev 18133 (version 3.1-1~experimental.1).) --- debian/changelog | 1 + debian/rules.d/Makefile | 14 -------------- debian/rules.d/tools/Makefile | 10 ---------- debian/rules.d/tools/power/Makefile | 8 -------- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 debian/rules.d/Makefile delete mode 100644 debian/rules.d/tools/Makefile delete mode 100644 debian/rules.d/tools/power/Makefile diff --git a/debian/changelog b/debian/changelog index a1d431177..051362cad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ linux (4.19.16-2) UNRELEASED; urgency=medium [ Ben Hutchings ] * debian/rules.d, debian/rules.real: Restore build of userland headers for tools + * debian/rules.d: Delete now-unused recursive makefiles -- Luca Boccassi Fri, 18 Jan 2019 19:09:06 +0000 diff --git a/debian/rules.d/Makefile b/debian/rules.d/Makefile deleted file mode 100644 index 4acd82dd6..000000000 --- a/debian/rules.d/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -DATA = \ - Kbuild \ - Makefile \ - -SUBDIRS = \ - scripts \ - tools - -DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) -ifneq ($(filter powerpc powerpcspe ppc64,$(DEB_HOST_ARCH)),) - SUBDIRS += arch/powerpc/boot -endif - -include $(top_rulesdir)/Makefile.inc diff --git a/debian/rules.d/tools/Makefile b/debian/rules.d/tools/Makefile deleted file mode 100644 index 224f125b8..000000000 --- a/debian/rules.d/tools/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -SUBDIRS = \ - hv \ - lib/bpf \ - lib/lockdep \ - objtool \ - perf \ - power \ - usb/usbip - -include $(top_rulesdir)/Makefile.inc diff --git a/debian/rules.d/tools/power/Makefile b/debian/rules.d/tools/power/Makefile deleted file mode 100644 index c3fcc4288..000000000 --- a/debian/rules.d/tools/power/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS = \ - cpupower - -ifneq ($(filter i386 amd64 x32,$(DEB_HOST_ARCH)),) -SUBDIRS += x86 -endif - -include $(top_rulesdir)/Makefile.inc