[linux-tools] 01/02: [x32] Don't attempt to build linux-perf (fixes FTBFS)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux-tools.

commit 98517d1ea6e34efaae3d11d63ac5a5f229e49c01
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Sep 29 14:12:43 2015 +0100

    [x32] Don't attempt to build linux-perf (fixes FTBFS)
---
 debian/build/tools/perf/Makefile | 5 ++++-
 debian/changelog                 | 6 ++++++
 debian/rules.real                | 2 +-
 debian/templates/control.main.in | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile
index 44ca192..c3d1c07 100644
--- a/debian/build/tools/perf/Makefile
+++ b/debian/build/tools/perf/Makefile
@@ -23,7 +23,10 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sh4)
 else ifneq ($(filter sparc%,$(DEB_HOST_ARCH_CPU)),)
   KERNEL_ARCH_PERF = sparc
 else ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH_CPU)),)
-  KERNEL_ARCH_PERF = x86
+  # But x32 isn't supported yet
+  ifneq ($(shell dpkg-architecture -qDEB_HOST_ARCH),x32)
+    KERNEL_ARCH_PERF = x86
+  endif
 endif
 
 MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error EXTRA_CFLAGS='$(CFLAGS) $(CPPFLAGS)' LDFLAGS='$(LDFLAGS)'
diff --git a/debian/changelog b/debian/changelog
index 1b79a39..0ec51a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (4.2-2) UNRELEASED; urgency=medium
+
+  * [x32] Don't attempt to build linux-perf (fixes FTBFS)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 29 Sep 2015 04:50:43 +0100
+
 linux-tools (4.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules.real b/debian/rules.real
index feaafa6..fc84db8 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -4,7 +4,7 @@ export KBUILD_BUILD_TIMESTAMP := $(shell dpkg-parsechangelog | sed -ne 's,^Date:
 include debian/rules.defs
 
 binary-arch: install-kbuild install-usbip install-lockdep
-ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32,$(DEB_BUILD_ARCH)),)
+ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-perf
 endif
 ifneq ($(filter i386 amd64,$(DEB_BUILD_ARCH)),)
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index 75ff672..b905cef 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -7,7 +7,7 @@ Description: Kbuild infrastructure for Linux @version@
 
 Package: linux-perf- at version@
 Section: devel
-Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32
+Architecture: alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 3.4~)
 Provides: linux-tools- at version@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-tools.git