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

[Ben Hutchings]

Author: benh
Date: Tue Aug  4 20:40:47 2015
New Revision: 22925

Log:
Merge changes from sid up to 4.1.4-2

Added:
   dists/trunk/linux-tools/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch
      - copied unchanged from r22910, dists/sid/linux-tools/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch
Modified:
   dists/trunk/linux-tools/   (props changed)
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/series

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Tue Aug  4 20:39:14 2015	(r22924)
+++ dists/trunk/linux-tools/debian/changelog	Tue Aug  4 20:40:47 2015	(r22925)
@@ -1,3 +1,10 @@
+linux-tools (4.1.4-2) unstable; urgency=medium
+
+  * [mips*,alpha,hppa] linux-perf: Add empty Build files for these architectures
+    (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 04 Aug 2015 17:11:46 +0100
+
 linux-tools (4.1.4-1) unstable; urgency=medium
 
   * New upstream stable update:

Modified: dists/trunk/linux-tools/debian/patches/series
==============================================================================
--- dists/trunk/linux-tools/debian/patches/series	Tue Aug  4 20:39:14 2015	(r22924)
+++ dists/trunk/linux-tools/debian/patches/series	Tue Aug  4 20:40:47 2015	(r22925)
@@ -5,3 +5,4 @@
 kbuild-fix-recordmcount-dependency.patch
 usbip-include-uninstalled-linux-usbip-h.patch
 tools-perf-man-date.patch
+tools-perf-add-empty-build-files-for-architectures-lacking.patch

Copied: dists/trunk/linux-tools/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch (from r22910, dists/sid/linux-tools/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch	Tue Aug  4 20:40:47 2015	(r22925, copy of r22910, dists/sid/linux-tools/debian/patches/tools-perf-add-empty-build-files-for-architectures-lacking.patch)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Tue, 04 Aug 2015 16:59:53 +0100
+Subject: tools/perf: Add empty Build files for architectures lacking them
+Forwarded: http://mid.gmane.org/1438704627.7315.2.camel@decadent.org.uk
+
+perf currently fails to build on MIPS as there is no
+tools/perf/arch/mips/Build file.  Adding an empty file fixes this as
+there are no MIPS-specific sources to build.
+
+It looks like the same is needed for Alpha and PA-RISC, though I
+haven't been able to test those.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Fixes: 5e8c0fb6a957 ("perf build: Add arch x86 objects building")
+---
+--- /dev/null
++++ b/tools/perf/arch/alpha/Build
+@@ -0,0 +1 @@
++# empty
+--- /dev/null
++++ b/tools/perf/arch/mips/Build
+@@ -0,0 +1,1 @@
++# empty
+--- /dev/null
++++ b/tools/perf/arch/parisc/Build
+@@ -0,0 +1 @@
++# empty