[kernel] r18681 - in dists/trunk/firmware-free/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sat Feb 11 18:21:10 2012
New Revision: 18681

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

Modified:
   dists/trunk/firmware-free/debian/changelog
   dists/trunk/firmware-free/debian/rules.real
   dists/trunk/firmware-free/debian/templates/control.binary.in

Modified: dists/trunk/firmware-free/debian/changelog
==============================================================================
--- dists/trunk/firmware-free/debian/changelog	Sat Feb 11 18:20:01 2012	(r18680)
+++ dists/trunk/firmware-free/debian/changelog	Sat Feb 11 18:21:10 2012	(r18681)
@@ -5,6 +5,8 @@
       source package
   * Add isci parameter blob
   * Add makefiles and scripts for av7110, dsp56k and keyspan_pda firmware
+  * debian/control: Set Multi-Arch: foreign to allow for installation
+    of foreign linux-image packages
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 29 Dec 2011 19:09:09 +0100
 

Modified: dists/trunk/firmware-free/debian/rules.real
==============================================================================
--- dists/trunk/firmware-free/debian/rules.real	Sat Feb 11 18:20:01 2012	(r18680)
+++ dists/trunk/firmware-free/debian/rules.real	Sat Feb 11 18:21:10 2012	(r18681)
@@ -2,6 +2,7 @@
 DEB_HOST_ARCH     := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a$(ARCH) -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_ARCH    := $(shell dpkg-architecture -a$(ARCH) -qDEB_BUILD_ARCH)
+HAVE_MULTIARCH    := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
 
 export DH_OPTIONS
 
@@ -18,6 +19,11 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
+ifneq (,$(HAVE_MULTIARCH))
+	echo firmware:Multi-Arch=foreign >>debian/$(PACKAGE_NAME).substvars
+else
+	echo firmware:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
+endif
 	@for i in $(FILES); do \
 	  s=$(PACKAGE)/"$${i%:*}"; \
 	  d=/lib/firmware/"$${i#*:}"; \

Modified: dists/trunk/firmware-free/debian/templates/control.binary.in
==============================================================================
--- dists/trunk/firmware-free/debian/templates/control.binary.in	Sat Feb 11 18:20:01 2012	(r18680)
+++ dists/trunk/firmware-free/debian/templates/control.binary.in	Sat Feb 11 18:21:10 2012	(r18681)
@@ -6,4 +6,5 @@
 Description: Binary firmware for @desc@
  @longdesc@
 Homepage: @uri@
+Multi-Arch: ${firmware:Multi-Arch}