[kernel] r18808 - in dists/trunk/linux-tools/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sun Mar 11 03:38:16 2012
New Revision: 18808

Log:
linux-kbuild: debian/control: Set Multi-Arch: foreign

Modified:
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/rules.real
   dists/trunk/linux-tools/debian/templates/control.main.in

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Sun Mar 11 03:27:44 2012	(r18807)
+++ dists/trunk/linux-tools/debian/changelog	Sun Mar 11 03:38:16 2012	(r18808)
@@ -1,6 +1,7 @@
 linux-tools (3.3~rc7-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
+  * linux-kbuild: debian/control: Set Multi-Arch: foreign
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 11 Mar 2012 02:08:45 +0000
 

Modified: dists/trunk/linux-tools/debian/rules.real
==============================================================================
--- dists/trunk/linux-tools/debian/rules.real	Sun Mar 11 03:27:44 2012	(r18807)
+++ dists/trunk/linux-tools/debian/rules.real	Sun Mar 11 03:38:16 2012	(r18808)
@@ -3,6 +3,7 @@
 include debian/rules.defs
 
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
 
 binary-arch: install-kbuild
 ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
@@ -23,6 +24,11 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
+ifneq (,$(HAVE_MULTIARCH))
+	echo linux-kbuild:Multi-Arch=foreign >>debian/$(PACKAGE_NAME).substvars
+else
+	echo linux-kbuild:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
+endif
 	$(MAKE) -C $(BUILD_DIR)/scripts install prefix=$(DIR) top_srcdir=$(CURDIR)
 	dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
 	dh_installchangelogs

Modified: dists/trunk/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-tools/debian/templates/control.main.in	Sun Mar 11 03:27:44 2012	(r18807)
+++ dists/trunk/linux-tools/debian/templates/control.main.in	Sun Mar 11 03:38:16 2012	(r18808)
@@ -1,6 +1,7 @@
 Package: linux-kbuild- at version@
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: ${linux-kbuild:Multi-Arch}
 Description: Kbuild infrastructure for Linux @version@
  This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version at .