[kernel] r19845 - in dists/trunk/linux-tools/debian: . build/tools/perf patches

[Ben Hutchings]

Author: benh
Date: Sun Feb 24 05:15:41 2013
New Revision: 19845

Log:
Update to 3.8

Refresh perf patches.

Modified:
   dists/trunk/linux-tools/debian/build/tools/perf/Makefile
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/tools-perf-install.patch
   dists/trunk/linux-tools/debian/patches/tools-perf-version.patch

Modified: dists/trunk/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Sun Feb 24 04:41:17 2013	(r19844)
+++ dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Sun Feb 24 05:15:41 2013	(r19845)
@@ -38,6 +38,7 @@
 	-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

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Sun Feb 24 04:41:17 2013	(r19844)
+++ dists/trunk/linux-tools/debian/changelog	Sun Feb 24 05:15:41 2013	(r19845)
@@ -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 <jrnieder at gmail.com>  Sat, 29 Dec 2012 22:51:43 -0800
 

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-install.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-install.patch	Sun Feb 24 04:41:17 2013	(r19844)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-install.patch	Sun Feb 24 05:15:41 2013	(r19845)
@@ -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)'

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-version.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Sun Feb 24 04:41:17 2013	(r19844)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Sun Feb 24 05:15:41 2013	(r19845)
@@ -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 @@
- 
- install: install-man
+@@ -188,13 +188,15 @@ ifdef missing_tools
+ 	$(error "You need to install $(missing_tools) for man pages")
+ endif
  
--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
+