[kernel] r18546 - dists/squeeze-backports/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Mon Jan 16 15:14:34 2012
New Revision: 18546

Log:
Build linux-libc-dev without multiarch

Modified:
   dists/squeeze-backports/linux-2.6/debian/changelog
   dists/squeeze-backports/linux-2.6/debian/rules.real

Modified: dists/squeeze-backports/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/changelog	Mon Jan 16 06:05:55 2012	(r18545)
+++ dists/squeeze-backports/linux-2.6/debian/changelog	Mon Jan 16 15:14:34 2012	(r18546)
@@ -3,6 +3,7 @@
   * Rebuild for squeeze:
     - Use gcc-4.4 for all architectures
     - Disable building of udebs
+    - Build linux-libc-dev without multiarch
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 16 Jan 2012 05:33:03 +0000
 

Modified: dists/squeeze-backports/linux-2.6/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux-2.6/debian/rules.real	Mon Jan 16 06:05:55 2012	(r18545)
+++ dists/squeeze-backports/linux-2.6/debian/rules.real	Mon Jan 16 15:14:34 2012	(r18546)
@@ -297,9 +297,11 @@
 	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)/
+endif
 	
 	+$(MAKE_SELF) install-base