From 3ad679557793e4e22b9c90d09a34b6411e31228a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 24 Feb 2013 05:15:41 +0000 Subject: [PATCH] Update to 3.8 Refresh perf patches. svn path=/dists/trunk/linux-tools/; revision=19845 --- debian/build/tools/perf/Makefile | 1 + debian/changelog | 4 +++- debian/patches/tools-perf-install.patch | 8 ++++++- debian/patches/tools-perf-version.patch | 32 ++++++++++++------------- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index 9372be1a4e97..b6dfa2f107e3 100644 --- a/debian/build/tools/perf/Makefile +++ b/debian/build/tools/perf/Makefile @@ -38,6 +38,7 @@ ifdef KERNEL_ARCH_PERF -mkdir out # upstream makefile is broken cp -al $(top_srcdir)/tools/perf/Documentation doc + cp -al $(top_srcdir)/tools/perf/config config +$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out all VERSION=$(VERSION) +$(MAKE_PERF) -C doc man VERSION=$(VERSION) endif diff --git a/debian/changelog b/debian/changelog index 0a7b852e2c26..1fc7d4abeb22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -linux-tools (3.7.1-1~experimental.2) UNRELEASED; urgency=low +linux-tools (3.8-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release -- Jonathan Nieder Sat, 29 Dec 2012 22:51:43 -0800 diff --git a/debian/patches/tools-perf-install.patch b/debian/patches/tools-perf-install.patch index 34d612cdeb63..e8e642c1fba0 100644 --- a/debian/patches/tools-perf-install.patch +++ b/debian/patches/tools-perf-install.patch @@ -1,6 +1,6 @@ --- a/tools/perf/Makefile +++ b/tools/perf/Makefile -@@ -1051,16 +1051,16 @@ +@@ -1105,20 +1105,20 @@ install: all try-install-man $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' @@ -19,6 +19,12 @@ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d' - $(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' + $(INSTALL) -m 644 bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' +- $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' ++ $(INSTALL) -m 644 tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests' + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' +- $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' ++ $(INSTALL) -m 644 tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr' install-python_ext: $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)' diff --git a/debian/patches/tools-perf-version.patch b/debian/patches/tools-perf-version.patch index b4f890461eed..ee91b535f2ab 100644 --- a/debian/patches/tools-perf-version.patch +++ b/debian/patches/tools-perf-version.patch @@ -1,31 +1,31 @@ --- a/tools/perf/Makefile +++ b/tools/perf/Makefile -@@ -1047,7 +1047,7 @@ +@@ -1101,7 +1101,7 @@ perfexec_instdir_SQ = $(subst ','\'',$(p - install: all + install: all try-install-man $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)/perf_$(VERSION)' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' -@@ -1069,7 +1069,7 @@ - $(MAKE) -C Documentation install +@@ -1125,7 +1125,7 @@ install-python_ext: - install-man: -- $(MAKE) -C Documentation install-man -+ $(MAKE) -C Documentation install-man VERSION=$(VERSION) + # 'make install-doc' should call 'make -C Documentation install' + $(INSTALL_DOC_TARGETS): +- $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=) ++ $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) $(@:-doc=) VERSION=$(VERSION) + + ### Cleaning rules - install-html: - $(MAKE) -C Documentation install-html --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile -@@ -170,13 +170,15 @@ +@@ -188,13 +188,15 @@ ifdef missing_tools + $(error "You need to install $(missing_tools) for man pages") + endif - install: install-man - --install-man: man -+install-man: $(addprefix install-man-,$(_DOC_MAN1)) +-do-install-man: man ++do-install-man: $(addprefix install-man-,$(_DOC_MAN1)) + +install-man-perf.1: $(OUTPUT)perf.1 + $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) @@ -40,5 +40,5 @@ -# $(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir) + sed -e 's/"PERF\\-/"PERF_$(VERSION)\\-/' -e 's/fBperf-/fBperf_$(VERSION)-/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION)$*.1 - install-info: info - $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) + install-man: check-man-tools man +