[kernel] r16421 - in dists/trunk/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sun Oct 10 02:12:28 2010
New Revision: 16421

Log:
On second thoughts, move scripts to /usr/share/perf_<version>-core

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.main.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Oct 10 01:48:46 2010	(r16420)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Oct 10 02:12:28 2010	(r16421)
@@ -7,8 +7,7 @@
   * [x86] Staging: fix Makefile so brcm80211 will actually build
     (Closes: #599465)
   * [x86] Enable modular IDEAPAD_ACPI (Closes: #599444)
-  * perf: Move scripts to /usr/share/perf-core in linux-base package
-    (Closes: #599624)
+  * perf: Move scripts to /usr/share/perf_<version>-core (Closes: #599624)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Oct 2010 03:24:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Sun Oct 10 01:48:46 2010	(r16420)
+++ dists/trunk/linux-2.6/debian/rules.real	Sun Oct 10 02:12:28 2010	(r16421)
@@ -32,7 +32,7 @@
 MAKE_CLEAN = $(setup_env) $(MAKE)
 MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
 MAKEOVERRIDES =
-MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf-core NO_PERL=1 V=2
+MAKE_PERF_VARS = prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2
 
 #
 # Targets
@@ -503,8 +503,6 @@
 	# Fix up cross-references
 	sed -i '/^\.SH "SEE ALSO"/,/^\.SH/ { s/perf-/perf_$(VERSION)-/g }' \
 		$(PACKAGE_DIR)/usr/share/man/*/*
-	# Remove scripts
-	rm -rf $(PACKAGE_DIR)/usr/share/perf-core
 	+$(MAKE_SELF) install-base
 
 install-patch: PACKAGE = linux-patch-debian-$(VERSION)
@@ -544,20 +542,12 @@
 	+$(MAKE_SELF) install-base
 
 install-linux-base: PACKAGE_NAME = linux-base
-install-linux-base: PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-linux-base: DH_OPTIONS := -p$(PACKAGE_NAME)
 install-linux-base:
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_install debian/bin/perf /usr/bin
-	dh_installdirs /usr/share/perf-core
-	for source in debian/build/source/tools/perf/perf-*.sh; do	\
-		dest=usr/share/perf-core/"$$(basename $$source .sh)";	\
-		cp -dp "$$source" $(PACKAGE_DIR)/"$$dest" || exit;	\
-	done
-	cp -dpR debian/build/source/tools/perf/scripts			\
-		$(PACKAGE_DIR)/usr/share/perf-core/scripts
 	dh_installman debian/perf.1
 	dh_installdebconf
 	+$(MAKE_SELF) install-base

Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	Sun Oct 10 01:48:46 2010	(r16420)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Sun Oct 10 02:12:28 2010	(r16421)
@@ -1,10 +1,14 @@
 Package: linux-tools- at version@
 Architecture: alpha amd64 armel hppa i386 powerpc s390 sh4 sparc sparc64
-Depends: ${shlibs:Depends}, ${misc:Depends}, linux-base (>= 2.6.32-16)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: linux-base (>= 2.6.32-16)
 Suggests: linux-doc- at version@
 Description: Performance analysis tools for Linux @upstreamversion@
  This package contains the 'perf' performance analysis tools for Linux
  kernel version @upstreamversion at .
+ .
+ The linux-base package contains a 'perf' command which will invoke the
+ appropriate version for the running kernel.
 
 Package: linux-source- at version@
 Architecture: all
@@ -93,5 +97,5 @@
 Depends: libuuid-perl, ${misc:Depends}, util-linux (>= 2.16-1) | udev (<< 146-1)
 Description: Linux image base package
  This package contains files and support scripts for all Linux
- images and for the 'perf' tools.
+ images.