[kernel] r19166 - in dists/trunk/linux/debian: . bin config config/x32

[Ben Hutchings]

Author: benh
Date: Mon Jun 18 14:50:18 2012
New Revision: 19166

Log:
[x32] Build a linux-libc-dev package

Added:
   dists/trunk/linux/debian/config/x32/
   dists/trunk/linux/debian/config/x32/defines
Modified:
   dists/trunk/linux/debian/bin/gencontrol.py
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/defines
   dists/trunk/linux/debian/rules.real

Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py	Mon Jun 18 05:16:18 2012	(r19165)
+++ dists/trunk/linux/debian/bin/gencontrol.py	Mon Jun 18 14:50:18 2012	(r19166)
@@ -86,6 +86,10 @@
         self._setup_makeflags(self.arch_makeflags, makeflags, config_base)
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
+        # Some userland architectures require kernels from another
+        # (Debian) architecture, e.g. x32/amd64.
+        foreign_kernel = not self.config['base', arch].get('featuresets')
+
         if self.version.linux_modifier is None:
             try:
                 vars['abiname'] = '-%s' % self.config['abi', arch]['abiname']
@@ -93,8 +97,12 @@
                 vars['abiname'] = self.abiname
             makeflags['ABINAME'] = vars['abiname']
 
-        headers_arch = self.templates["control.headers.arch"]
-        packages_headers_arch = self.process_packages(headers_arch, vars)
+        if foreign_kernel:
+            packages_headers_arch = []
+            makeflags['FOREIGN_KERNEL'] = True
+        else:
+            headers_arch = self.templates["control.headers.arch"]
+            packages_headers_arch = self.process_packages(headers_arch, vars)
 
         libc_dev = self.templates["control.libc-dev"]
         packages_headers_arch[0:0] = self.process_packages(libc_dev, {})

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Jun 18 05:16:18 2012	(r19165)
+++ dists/trunk/linux/debian/changelog	Mon Jun 18 14:50:18 2012	(r19166)
@@ -9,6 +9,7 @@
   * [x86] Enable BATTERY_SBS as module (Closes: #662902)
   * team: Enable NET_TEAM_MODE_LOADBALANCE as module
   * [rt] Update to 3.4.2-rt10 (no functional change)
+  * [x32] Build a linux-libc-dev package
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 07 Jun 2012 04:45:03 +0100
 

Modified: dists/trunk/linux/debian/config/defines
==============================================================================
--- dists/trunk/linux/debian/config/defines	Mon Jun 18 05:16:18 2012	(r19165)
+++ dists/trunk/linux/debian/config/defines	Mon Jun 18 14:50:18 2012	(r19166)
@@ -20,6 +20,7 @@
  sh4
  sparc
  sparc64
+ x32
 compiler: gcc-4.6
 featuresets:
  none

Added: dists/trunk/linux/debian/config/x32/defines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/config/x32/defines	Mon Jun 18 14:50:18 2012	(r19166)
@@ -0,0 +1,4 @@
+[base]
+kernel-arch: x86
+featuresets:
+# empty; x32 must be part of a multiarch installation with an amd64 kernel

Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real	Mon Jun 18 05:16:18 2012	(r19165)
+++ dists/trunk/linux/debian/rules.real	Mon Jun 18 14:50:18 2012	(r19166)
@@ -35,7 +35,9 @@
 #
 # Targets
 #
-binary-arch-arch: install-headers_$(ARCH)
+ifneq ($(FOREIGN_KERNEL),True)
+  binary-arch-arch: install-headers_$(ARCH)
+endif
 binary-arch-arch: install-libc-dev_$(ARCH)
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
 binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)