From 38cac7323909c738135f376cadc36209481afc06 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 21 Feb 2016 15:30:51 +0000 Subject: [PATCH 1/2] Update patches to upstream versions --- ...ling-kernel-only-linux-nvme.h-as-uap.patch | 2 +- ...behaviour-of-shift-tab-with-nothing.patch} | 18 ++++-- ...remove-wrong-semicolon-in-while-loop.patch | 16 +++-- ...ls-fix-reading-of-build-id-from-vdso.patch | 2 +- debian/patches/series | 4 +- ...d-use-fixdep-with-output-path-prefix.patch | 59 +++++++++++++++++++ ...tools-stop-building-fixdep-in-source.patch | 20 ------- 7 files changed, 88 insertions(+), 33 deletions(-) rename debian/patches/{perf-add-missing-braces-to-if-statement.patch => perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch} (59%) create mode 100644 debian/patches/tools-build-use-fixdep-with-output-path-prefix.patch delete mode 100644 debian/patches/tools-stop-building-fixdep-in-source.patch diff --git a/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch b/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch index 633b219e6..66a08d4ea 100644 --- a/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch +++ b/debian/patches/nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch @@ -1,7 +1,7 @@ From: Ben Hutchings Date: Mon, 14 Dec 2015 01:09:32 +0000 Subject: nvme: Stop installing kernel-only as UAPI -Forwarded: http://mid.gmane.org/20151214011442.GL28542@decadent.org.uk +Forwarded: not-needed Fixes: 9d99a8dda154 ("nvme: move hardware structures out of the uapi ...") Signed-off-by: Ben Hutchings diff --git a/debian/patches/perf-add-missing-braces-to-if-statement.patch b/debian/patches/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch similarity index 59% rename from debian/patches/perf-add-missing-braces-to-if-statement.patch rename to debian/patches/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch index e56236650..911cc53a8 100644 --- a/debian/patches/perf-add-missing-braces-to-if-statement.patch +++ b/debian/patches/perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch @@ -1,15 +1,23 @@ From: Markus Trippelsdorf -Subject: Add missing braces to if statement Date: Mon, 14 Dec 2015 16:44:03 +0100 -Origin: http://article.gmane.org/gmane.linux.kernel/2108038 - -Add missing braces to if statement. +Subject: perf annotate browser: Fix behaviour of Shift-Tab with nothing + focussed +Origin: https://git.kernel.org/linus/d4913cbd05bab685e49c8174896e563b2487d054 The issue was pointed out by gcc-6's -Wmisleading-indentation. -Acked-by: Ingo Molnar Signed-off-by: Markus Trippelsdorf +Acked-by: Ingo Molnar +Cc: Ben Hutchings +Cc: Matt Fleming +Cc: Peter Zijlstra +Fixes: c97cf42219b7 ("perf top: Live TUI Annotation") +Link: http://lkml.kernel.org/r/20151214154403.GB1409@x4 +Signed-off-by: Arnaldo Carvalho de Melo --- + tools/perf/ui/browsers/annotate.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c index d4d7cc27252f..718bd46d47fa 100644 --- a/tools/perf/ui/browsers/annotate.c diff --git a/debian/patches/perf-remove-wrong-semicolon-in-while-loop.patch b/debian/patches/perf-remove-wrong-semicolon-in-while-loop.patch index 9a8c03722..616e14277 100644 --- a/debian/patches/perf-remove-wrong-semicolon-in-while-loop.patch +++ b/debian/patches/perf-remove-wrong-semicolon-in-while-loop.patch @@ -1,18 +1,26 @@ From: Markus Trippelsdorf -Subject: Remove wrong semicolon in while loop Date: Mon, 14 Dec 2015 16:43:35 +0100 -Origin: http://article.gmane.org/gmane.linux.kernel/2108037 +Subject: perf tests: Remove wrong semicolon in while loop in CQM test +Origin: https://git.kernel.org/linus/cf89813a5b514bff9b3b5e7eaf2090f22fba62e0 The while loop was spinning. Fix by removing a semicolon. The issue was pointed out by gcc-6's -Wmisleading-indentation. +Signed-off-by: Markus Trippelsdorf Reviewed-by: Matt Fleming Acked-by: Ingo Molnar -Signed-off-by: Markus Trippelsdorf +Cc: Ben Hutchings +Cc: Peter Zijlstra +Fixes: 035827e9f2bd ("perf tests: Add Intel CQM test") +Link: http://lkml.kernel.org/r/20151214154335.GA1409@x4 +Signed-off-by: Arnaldo Carvalho de Melo --- + tools/perf/arch/x86/tests/intel-cqm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c -index d28c1b6a3b54..fa5d17af88b7 100644 +index 3e89ba825f6b..7f064eb37158 100644 --- a/tools/perf/arch/x86/tests/intel-cqm.c +++ b/tools/perf/arch/x86/tests/intel-cqm.c @@ -17,7 +17,7 @@ static pid_t spawn(void) diff --git a/debian/patches/perf-tools-fix-reading-of-build-id-from-vdso.patch b/debian/patches/perf-tools-fix-reading-of-build-id-from-vdso.patch index 7ca7c0c57..198a87556 100644 --- a/debian/patches/perf-tools-fix-reading-of-build-id-from-vdso.patch +++ b/debian/patches/perf-tools-fix-reading-of-build-id-from-vdso.patch @@ -1,7 +1,7 @@ From: Ben Hutchings Date: Wed, 13 Jan 2016 15:16:30 +0000 Subject: perf tools: Fix reading of build-id from vDSO -Forwarded: http://mid.gmane.org/20160113172301.GT28542@decadent.org.uk +Origin: https://git.kernel.org/linus/40c4a0f92aed570cc529a1e5c24c7e04a0ce8b85 We need to use the long name (the filename) when reading the build-id from a DSO. Using the short name doesn't work for (at least) vDSOs. diff --git a/debian/patches/series b/debian/patches/series index a845fe63a..1f4f8c538 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,9 +17,9 @@ alpha-uapi-add-support-for-__sane_userspace_types__.patch nvme-stop-installing-kernel-only-linux-nvme.h-as-uap.patch perf-tools-fix-reading-of-build-id-from-vdso.patch perf-fix-misleadingly-indented-assignment-whitespace.patch -perf-add-missing-braces-to-if-statement.patch +perf-annotate-browser-fix-behaviour-of-shift-tab-with-nothing.patch 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 +tools-build-use-fixdep-with-output-path-prefix.patch diff --git a/debian/patches/tools-build-use-fixdep-with-output-path-prefix.patch b/debian/patches/tools-build-use-fixdep-with-output-path-prefix.patch new file mode 100644 index 000000000..4d11bbba5 --- /dev/null +++ b/debian/patches/tools-build-use-fixdep-with-output-path-prefix.patch @@ -0,0 +1,59 @@ +From: Jiri Olsa +Date: Thu, 26 Nov 2015 19:50:55 +0100 +Subject: tools build: Use fixdep with OUTPUT path prefix +Origin: https://git.kernel.org/linus/5e50426d5d9049dfdb8b2b18e761717e7e80a6ad + +Adding OUTPUT path prefix for fixdep target so we use it properly in out +of tree builds. + +If the fixdep already existed in the tree, the out of tree build would +see it already exist and did not build the out of tree version, as +reported by Arnaldo: + + [acme@zoo linux]$ make O=/tmp/build/perf -C tools/perf + make: Entering directory '/home/git/linux/tools/perf' + BUILD: Doing 'make -j4' parallel build + make[2]: Nothing to be done for 'fixdep'. + make: Leaving directory '/home/git/linux/tools/perf' + +Reported-and-Tested-by: Arnaldo Carvalho de Melo +Signed-off-by: Jiri Olsa +Cc: David Ahern +Cc: Namhyung Kim +Cc: Peter Zijlstra +Cc: Wang Nan +Link: http://lkml.kernel.org/r/20151126185055.GC19410@krava.brq.redhat.com +[ Fixed conflict with 5725dd8fa888 ("tools build: Clean CFLAGS and LDFLAGS for fixdep") ] +Signed-off-by: Arnaldo Carvalho de Melo +[bwh: Backported to 4.4: adjust context] +--- + tools/build/Makefile | 2 +- + tools/build/Makefile.include | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/build/Makefile b/tools/build/Makefile +index a93036272d43..0d5a0e3a8fa9 100644 +--- a/tools/build/Makefile ++++ b/tools/build/Makefile +@@ -25,7 +25,7 @@ export Q srctree CC LD + MAKEFLAGS := --no-print-directory + build := -f $(srctree)/tools/build/Makefile.build dir=. obj + +-all: fixdep ++all: $(OUTPUT)fixdep + + clean: + $(call QUIET_CLEAN, fixdep) +diff --git a/tools/build/Makefile.include b/tools/build/Makefile.include +index 6254760290c9..be630bed66d2 100644 +--- 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 diff --git a/debian/patches/tools-stop-building-fixdep-in-source.patch b/debian/patches/tools-stop-building-fixdep-in-source.patch deleted file mode 100644 index aae97ba39..000000000 --- a/debian/patches/tools-stop-building-fixdep-in-source.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 From 68b1d566ae480617872c21a5efc2de8323c8776a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 21 Feb 2016 16:58:27 +0000 Subject: [PATCH 2/2] hyperv-daemons: Only build the progarams on x86 (fixes FTBFS) The daemons themselves can be built for any architecture, although on !x86 they are useless and won't be included in any package. However, the newly introduced check-hyperv.c include inline assembly which breaks the build. --- debian/build/tools/hv/Makefile | 9 +++++++++ debian/changelog | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/debian/build/tools/hv/Makefile b/debian/build/tools/hv/Makefile index fb3ff37a2..c958962cb 100644 --- a/debian/build/tools/hv/Makefile +++ b/debian/build/tools/hv/Makefile @@ -1,3 +1,10 @@ +ifeq ($(filter i386 amd64 x32,$(DEB_BUILD_ARCH)),) + +# Build nothing +include ../../Makefile.inc + +else + PROGS = \ hv_fcopy_daemon \ hv_kvp_daemon \ @@ -15,3 +22,5 @@ install-local-progs: $(PROGS) install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$$(basename $$p)"; \ done install -D -m755 check-hyperv '$(DESTDIR)/lib/hyperv-daemons/check-hyperv' + +endif diff --git a/debian/changelog b/debian/changelog index fecf5bb31..3a35e5065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-tools (4.4-4) unstable; urgency=medium + + * hyperv-daemons: Only build the progarams on x86 (fixes FTBFS) + + -- Ben Hutchings Sun, 21 Feb 2016 16:57:55 +0000 + linux-tools (4.4-3) unstable; urgency=medium * hyperv-daemons: Add init scripts