[kernel] r22593 - in dists/trunk/linux-tools/debian: . patches

[Ben Hutchings]

Author: benh
Date: Mon May 11 00:27:16 2015
New Revision: 22593

Log:
linux-tools: Add version suffix to the new perf-read-vdso{,x}32 commands

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

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Mon May 11 00:20:08 2015	(r22592)
+++ dists/trunk/linux-tools/debian/changelog	Mon May 11 00:27:16 2015	(r22593)
@@ -1,6 +1,8 @@
 linux-tools (4.0.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * linux-tools: Add version suffix to the new perf-read-vdso{,x}32
+    commands
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 11 May 2015 00:46:20 +0100
 

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-version.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Mon May 11 00:20:08 2015	(r22592)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Mon May 11 00:27:16 2015	(r22593)
@@ -5,11 +5,12 @@
 
 [bwh: Fix version insertion in perf man page cross-references and perf
 man page title.  Install bash_completion script for perf with a
-version-dependent name.  And do the same for trace.]
+version-dependent name.  And do the same for trace.  And the same for
+perf-read-vdso{,x}32.]
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -923,8 +923,8 @@ install-gtk:
+@@ -923,15 +923,15 @@ install-gtk:
  install-bin: all install-gtk
  	$(call QUIET_INSTALL, binaries) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
@@ -19,7 +20,16 @@
 +		$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf_$(VERSION)' '$(DESTDIR_SQ)$(bindir_SQ)/trace_$(VERSION)'
  ifndef NO_PERF_READ_VDSO32
  	$(call QUIET_INSTALL, perf-read-vdso32) \
- 		$(INSTALL) $(OUTPUT)perf-read-vdso32 '$(DESTDIR_SQ)$(bindir_SQ)';
+-		$(INSTALL) $(OUTPUT)perf-read-vdso32 '$(DESTDIR_SQ)$(bindir_SQ)';
++		$(INSTALL) $(OUTPUT)perf-read-vdso32 '$(DESTDIR_SQ)$(bindir_SQ)/perf-read-vdso32_$(VERSION)';
+ endif
+ ifndef NO_PERF_READ_VDSOX32
+ 	$(call QUIET_INSTALL, perf-read-vdsox32) \
+-		$(INSTALL) $(OUTPUT)perf-read-vdsox32 '$(DESTDIR_SQ)$(bindir_SQ)';
++		$(INSTALL) $(OUTPUT)perf-read-vdsox32 '$(DESTDIR_SQ)$(bindir_SQ)/perf-read-vdsox32_$(VERSION)';
+ endif
+ 	$(call QUIET_INSTALL, libexec) \
+ 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
 @@ -957,7 +957,7 @@ ifndef NO_LIBPYTHON
  endif
  	$(call QUIET_INSTALL, perf_completion-script) \
@@ -63,3 +73,29 @@
  
  install-man: check-man-tools man
  
+--- a/tools/perf/util/vdso.c
++++ b/tools/perf/util/vdso.c
+@@ -22,6 +22,8 @@
+  */
+ #include "find-vdso-map.c"
+ 
++#include "PERF-VERSION-FILE"
++
+ #define VDSO__TEMP_FILE_NAME "/tmp/perf-vdso.so-XXXXXX"
+ 
+ struct vdso_file {
+@@ -51,12 +53,12 @@ static struct vdso_info *vdso_info__new(
+ 		.vdso32  = {
+ 			.temp_file_name = VDSO__TEMP_FILE_NAME,
+ 			.dso_name = DSO__NAME_VDSO32,
+-			.read_prog = "perf-read-vdso32",
++			.read_prog = "perf-read-vdso32_" PERF_VERSION,
+ 		},
+ 		.vdsox32  = {
+ 			.temp_file_name = VDSO__TEMP_FILE_NAME,
+ 			.dso_name = DSO__NAME_VDSOX32,
+-			.read_prog = "perf-read-vdsox32",
++			.read_prog = "perf-read-vdsox32_" PERF_VERSION,
+ 		},
+ #endif
+ 	};