[kernel] r18677 - dists/trunk/linux-base/debian

[Ben Hutchings]

Author: benh
Date: Sat Feb 11 17:58:49 2012
New Revision: 18677

Log:
debian/control: Set Multi-Arch: foreign to allow for installation of foreign linux-image packages

Modified:
   dists/trunk/linux-base/debian/changelog
   dists/trunk/linux-base/debian/control
   dists/trunk/linux-base/debian/rules

Modified: dists/trunk/linux-base/debian/changelog
==============================================================================
--- dists/trunk/linux-base/debian/changelog	Sat Feb 11 17:54:37 2012	(r18676)
+++ dists/trunk/linux-base/debian/changelog	Sat Feb 11 17:58:49 2012	(r18677)
@@ -1,3 +1,10 @@
+linux-base (3.5) UNRELEASED; urgency=low
+
+  * debian/control: Set Multi-Arch: foreign to allow for installation
+    of foreign linux-image packages
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Feb 2012 17:52:19 +0000
+
 linux-base (3.4) unstable; urgency=low
 
   * perf: Fix lookup of the real command and package names for official

Modified: dists/trunk/linux-base/debian/control
==============================================================================
--- dists/trunk/linux-base/debian/control	Sat Feb 11 17:54:37 2012	(r18676)
+++ dists/trunk/linux-base/debian/control	Sat Feb 11 17:58:49 2012	(r18677)
@@ -11,6 +11,7 @@
 Package: linux-base
 Architecture: all
 Depends: libuuid-perl, ${misc:Depends}, util-linux (>= 2.16-1) | udev (<< 146-1)
+Multi-Arch: ${linux-base:Multi-Arch}
 Description: Linux image base package
  This package contains files and support scripts for all Linux
  images.

Modified: dists/trunk/linux-base/debian/rules
==============================================================================
--- dists/trunk/linux-base/debian/rules	Sat Feb 11 17:54:37 2012	(r18676)
+++ dists/trunk/linux-base/debian/rules	Sat Feb 11 17:58:49 2012	(r18677)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
+
 build:
 
 binary: binary-arch binary-indep
@@ -10,6 +12,11 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
+ifneq (,$(HAVE_MULTIARCH))
+	echo linux-base:Multi-Arch=foreign >>debian/linux-base.substvars
+else
+	echo linux-base:Multi-Arch= >>debian/linux-base.substvars
+endif
 	dh_install
 	dh_installman
 	dh_installdebconf