[kernel] r18602 - in dists/trunk/linux-2.6: . debian debian/templates

[Ben Hutchings]

Author: benh
Date: Mon Jan 23 01:25:31 2012
New Revision: 18602

Log:
Build linux-libc-dev without multiarch if dpkg does not support it, to support backports

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.libc-dev.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jan 22 23:49:56 2012	(r18601)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan 23 01:25:31 2012	(r18602)
@@ -11,6 +11,8 @@
   * Update Vcs-Browser URL for the switch to ViewVC
   * Point Vcs-{Svn,Browser} at trunk branch, since the sid branch does
     not always exist
+  * Build linux-libc-dev without multiarch if dpkg does not support it,
+    to support backports
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 19 Jan 2012 05:42:57 +0000
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Sun Jan 22 23:49:56 2012	(r18601)
+++ dists/trunk/linux-2.6/debian/rules.real	Mon Jan 23 01:25:31 2012	(r18602)
@@ -296,9 +296,14 @@
 	rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
 	find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
 
+ifneq (,$(DEB_HOST_MULTIARCH))
 	# Move include/asm to arch-specific directory
 	mkdir -p $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)
 	mv $(OUT_DIR)/include/asm $(OUT_DIR)/include/$(DEB_HOST_MULTIARCH)/
+	echo linux-libc-dev:Multi-Arch=same >>debian/$(PACKAGE_NAME).substvars
+else
+	echo linux-libc-dev:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars
+endif
 	
 	+$(MAKE_SELF) install-base
 

Modified: dists/trunk/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Sun Jan 22 23:49:56 2012	(r18601)
+++ dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Mon Jan 23 01:25:31 2012	(r18602)
@@ -4,7 +4,7 @@
 Provides: linux-kernel-headers
 Replaces: linux-kernel-headers
 Conflicts: linux-kernel-headers
-Multi-Arch: same
+Multi-Arch: ${linux-libc-dev:Multi-Arch}
 Description: Linux support headers for userspace development
  This package provides userspaces headers from the Linux kernel.  These headers
  are used by the installed headers for GNU glibc and other system libraries.