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

[Ben Hutchings]

Author: benh
Date: Tue Aug  4 19:51:25 2015
New Revision: 22911

Log:
perf: Update error message for missing perf executable, to refer to linux-perf-<version> for Linux 4.1 onward

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	Tue Aug  4 16:12:20 2015	(r22910)
+++ dists/trunk/linux-base/bin/perf	Tue Aug  4 19:51:25 2015	(r22911)
@@ -24,5 +24,13 @@
 exec "perf_$version" "$@"
 
 # Not found? Tell the user which package to install.
-echo >&2 "E: linux-tools-$version is not installed."
+case "$version" in
+    2.6.* | 3.* | 4.0 | 4.0.*)
+	package=linux-tools-$version
+	;;
+    *)
+	package=linux-perf-$version
+	;;
+esac
+echo >&2 "E: $package is not installed."
 exit 1

Modified: dists/trunk/linux-base/debian/changelog
==============================================================================
--- dists/trunk/linux-base/debian/changelog	Tue Aug  4 16:12:20 2015	(r22910)
+++ dists/trunk/linux-base/debian/changelog	Tue Aug  4 19:51:25 2015	(r22911)
@@ -23,6 +23,8 @@
   * Run version_cmp() unit tests at build time
   * linux-version: Fix sorting of version strings containing -trunk
     (Closes: #761614)
+  * perf: Update error message for missing perf executable, to refer to
+    linux-perf-<version> for Linux 4.1 onward
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 01 May 2012 01:54:46 +0100