[kernel] r18644 - in dists/sid/linux-latest/debian: . bin

[Ben Hutchings]

Author: benh
Date: Tue Jan 31 03:09:43 2012
New Revision: 18644

Log:
Update the check for flavours without modules

The configuration schema changed in 3.2, and we need to look elsewhere
for the modules flag.

This removes the useless and uninstallable
linux-headers{,-2.6}-s390x-tape packages.

Modified:
   dists/sid/linux-latest/debian/bin/gencontrol.py
   dists/sid/linux-latest/debian/changelog

Modified: dists/sid/linux-latest/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest/debian/bin/gencontrol.py	Sat Jan 28 02:18:46 2012	(r18643)
+++ dists/sid/linux-latest/debian/bin/gencontrol.py	Tue Jan 31 03:09:43 2012	(r18644)
@@ -63,7 +63,8 @@
         templates = []
 
         templates.extend(self.templates["control.image.latest.type-standalone"])
-        if config_base.get('modules', True):
+        if self.config.get_merge('build', arch, featureset, flavour,
+                                 'modules', True):
             templates.extend(self.templates["control.headers.latest"])
 
         image_fields = {'Description': PackageDescription()}

Modified: dists/sid/linux-latest/debian/changelog
==============================================================================
--- dists/sid/linux-latest/debian/changelog	Sat Jan 28 02:18:46 2012	(r18643)
+++ dists/sid/linux-latest/debian/changelog	Tue Jan 31 03:09:43 2012	(r18644)
@@ -5,6 +5,8 @@
     - Danish (Joe Hansen) (Closes: #656642)
     - Spanish (Slime Siabef) (Closes: #654681)
     - Italian (Stefano Canepa) (Closes: #657386)
+  * [s390] Update the check for flavours without modules, removing the
+    useless linux-headers{,-2.6}-s390x-tape packages
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 19 Jan 2012 14:16:11 +0000