[kernel] r18609 - in dists/trunk/linux-tools: . debian debian/build/tools/perf

[Ben Hutchings]

Author: benh
Date: Tue Jan 24 04:25:53 2012
New Revision: 18609

Log:
Merge changes from sid up to 3.1.1-3

Modified:
   dists/trunk/linux-tools/   (props changed)
   dists/trunk/linux-tools/debian/build/tools/perf/Makefile
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/rules
   dists/trunk/linux-tools/debian/rules.real

Modified: dists/trunk/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Tue Jan 24 03:57:49 2012	(r18608)
+++ dists/trunk/linux-tools/debian/build/tools/perf/Makefile	Tue Jan 24 04:25:53 2012	(r18609)
@@ -17,7 +17,7 @@
 else ifeq ($(DEB_HOST_ARCH_CPU),s390)
   KERNEL_ARCH_PERF = s390
 else ifeq ($(DEB_HOST_ARCH_CPU),s390x)
-  KERNEL_ARCH_PERF = s390x
+  KERNEL_ARCH_PERF = s390
 else ifeq ($(DEB_HOST_ARCH_CPU),sh4)
   KERNEL_ARCH_PERF = sh
 else ifeq ($(DEB_HOST_ARCH_CPU),sparc)

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Tue Jan 24 03:57:49 2012	(r18608)
+++ dists/trunk/linux-tools/debian/changelog	Tue Jan 24 04:25:53 2012	(r18609)
@@ -17,6 +17,20 @@
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 07 Dec 2011 01:53:15 +0000
 
+linux-tools (3.1.1-3) unstable; urgency=low
+
+  * Fix s390x support.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 18 Dec 2011 19:32:12 +0100
+
+linux-tools (3.1.1-2) unstable; urgency=low
+
+  * Change the check for stale debian/control to tolerate binNMUs
+    (Closes: #649005)
+  * Rebuild with perl 5.14 (Closes: #649006)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Thu, 17 Nov 2011 03:18:03 +0000
+
 linux-tools (3.1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: dists/trunk/linux-tools/debian/rules
==============================================================================
--- dists/trunk/linux-tools/debian/rules	Tue Jan 24 03:57:49 2012	(r18608)
+++ dists/trunk/linux-tools/debian/rules	Tue Jan 24 04:25:53 2012	(r18609)
@@ -55,13 +55,15 @@
 
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/control.*)
 debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
-	+if [ -f debian/control.md5sum ]; then \
-		if md5sum $^ | diff - debian/control.md5sum > /dev/null; then true; else \
-			$(MAKE) -f debian/rules debian/control-real; \
-		fi \
-	else \
-		$(MAKE) -f debian/rules debian/control-real; \
-	fi
+ifeq ($(wildcard debian/control.md5sum),)
+	$(MAKE) -f debian/rules debian/control-real
+else ifeq ($(VERSION_DEBIAN_BINNMU),)
+	md5sum --check debian/control.md5sum --status || \
+		$(MAKE) -f debian/rules debian/control-real
+else
+	grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \
+		$(MAKE) -f debian/rules debian/control-real
+endif
 
 debian/control-real: debian/bin/gencontrol.py $(CONTROL_FILES)
 	chmod +x $<

Modified: dists/trunk/linux-tools/debian/rules.real
==============================================================================
--- dists/trunk/linux-tools/debian/rules.real	Tue Jan 24 03:57:49 2012	(r18608)
+++ dists/trunk/linux-tools/debian/rules.real	Tue Jan 24 04:25:53 2012	(r18609)
@@ -5,7 +5,7 @@
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 binary-arch: install-kbuild
-ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
+ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-tools
 endif