From b0a0319c869a25b7403d46face0edf2cd49c143f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 19 Feb 2016 01:14:37 +0000 Subject: [PATCH] Build fixdep under debian/build and clean it up properly Mattia Dongili noted that it's currently built under tools/build (upstream bug). Build it under the current output directory (which means we build it multiple times) and clean all copies. --- debian/build/Makefile | 3 +++ debian/changelog | 1 + debian/patches/series | 1 + ...tools-stop-building-fixdep-in-source.patch | 20 +++++++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 debian/patches/tools-stop-building-fixdep-in-source.patch diff --git a/debian/build/Makefile b/debian/build/Makefile index 329e47ed26da..b2305e78515b 100644 --- a/debian/build/Makefile +++ b/debian/build/Makefile @@ -19,3 +19,6 @@ all-recursive: all-local clean-local:: rm -rf generated include out +# fixdep may be built in several places since we don't set the output directory +# consistently (XXX) + find -name fixdep -delete diff --git a/debian/changelog b/debian/changelog index dc3a280120b4..ecc0f3cde7c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ linux-tools (4.4-2) UNRELEASED; urgency=medium * linux-perf: Include version number in strace groups installation directory (Closes: #813080) * [alpha,sh4] Attempt to fix build failures + * Build fixdep under debian/build and clean it up properly -- Ben Hutchings Thu, 18 Feb 2016 21:46:41 +0000 diff --git a/debian/patches/series b/debian/patches/series index 17f92f0e3ed7..a845fe63af00 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,3 +22,4 @@ perf-tools-fix-unused-variables-x86_-32-64-_regoffse.patch perf-remove-wrong-semicolon-in-while-loop.patch revert-perf-tools-x86-build-perf-on-older-user-space.patch perf-tools-fix-bpf-feature-check.patch +tools-stop-building-fixdep-in-source.patch diff --git a/debian/patches/tools-stop-building-fixdep-in-source.patch b/debian/patches/tools-stop-building-fixdep-in-source.patch new file mode 100644 index 000000000000..aae97ba39c0d --- /dev/null +++ b/debian/patches/tools-stop-building-fixdep-in-source.patch @@ -0,0 +1,20 @@ +From: Ben Hutchings +Date: Fri, 19 Feb 2016 01:14:05 +0000 +Subject: tools: Stop building fixdep in the source directory + +Use the proper target, $(OUTPUT)fixdep, not fixdep. + +Reported-by: Mattia Dongili +Signed-off-by: Ben Hutchings +--- +--- a/tools/build/Makefile.include ++++ b/tools/build/Makefile.include +@@ -4,7 +4,7 @@ ifdef CROSS_COMPILE + fixdep: + else + fixdep: +- $(Q)$(MAKE) -C $(srctree)/tools/build fixdep ++ $(Q)$(MAKE) -C $(srctree)/tools/build $(OUTPUT)fixdep + endif + + .PHONY: fixdep