[kernel] r18276 - in dists/trunk/linux-base: bin debian

[Ben Hutchings]

Author: benh
Date: Mon Nov 14 05:44:11 2011
New Revision: 18276

Log:
perf: Fix lookup of the real command and package names

For official packages of Linux 3.1 onward and for custom kernels with
stable updates, ignore the last version component.

Modified:
   dists/trunk/linux-base/bin/perf
   dists/trunk/linux-base/debian/changelog

Modified: dists/trunk/linux-base/bin/perf
==============================================================================
--- dists/trunk/linux-base/bin/perf	Mon Nov 14 05:16:54 2011	(r18275)
+++ dists/trunk/linux-base/bin/perf	Mon Nov 14 05:44:11 2011	(r18276)
@@ -1,8 +1,25 @@
 #!/bin/bash
 
 # Execute the right version of perf for the current kernel.
+# Remove flavour or custom suffix and fix number of version components:
+# - For 2.6.x, use 3 components
+# - For 3.0 or 3.0.x, use 3.0.0
+# - Otherwise, use 2 components
 version="$(uname -r)"
 version="${version%%-*}"
+case "$version" in
+    2.6.*.*)
+	version="${version%.*}"
+	;;
+    2.6.*)
+	;;
+    3.0 | 3.0.*)
+	version=3.0.0
+	;;
+    *.*.*)
+	version="${version%.*}"
+	;;
+esac
 shopt -s execfail
 exec "perf_$version" "$@"
 

Modified: dists/trunk/linux-base/debian/changelog
==============================================================================
--- dists/trunk/linux-base/debian/changelog	Mon Nov 14 05:16:54 2011	(r18275)
+++ dists/trunk/linux-base/debian/changelog	Mon Nov 14 05:44:11 2011	(r18276)
@@ -1,3 +1,11 @@
+linux-base (3.4) unstable; urgency=low
+
+  * perf: Fix lookup of the real command and package names for official
+    packages of Linux 3.1 onward and for custom kernels with stable
+    updates
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Nov 2011 05:42:35 +0000
+
 linux-base (3.3) unstable; urgency=low
 
   * debian/control: Fix VCS URLs (Closes: #620609)