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

[Bastian Blank]

Author: waldi
Date: Mon Nov 24 13:17:28 2008
New Revision: 12446

Log:
* debian/bin/gencontrol.py: Use correct config section.
* debian/changelog: Update.


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

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Mon Nov 24 13:17:28 2008
@@ -32,15 +32,16 @@
         )
 
     def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
-        config_entry = self.config.merge('base', arch, featureset, flavour)
+        config_base = self.config.merge('base', arch, featureset, flavour)
+        config_image = self.config.merge('image', arch, featureset, flavour)
 
         templates = []
 
-        if config_entry.get('type', None) == 'plain-xen':
+        if config_image.get('type', None) == 'plain-xen':
             templates.extend(self.templates["control.image.latest.type-modules"])
         else:
             templates.extend(self.templates["control.image.latest.type-standalone"])
-        if config_entry.get('modules', True):
+        if config_base.get('modules', True):
             templates.extend(self.templates["control.headers.latest"])
 
         packages_dummy = self.process_packages(templates, vars)

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	(original)
+++ dists/sid/linux-latest-2.6/debian/changelog	Mon Nov 24 13:17:28 2008
@@ -1,3 +1,9 @@
+linux-latest-2.6 (17) UNRELEASED; urgency=low
+
+  * Use correct part of the config for image type.
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 24 Nov 2008 14:14:10 +0100
+
 linux-latest-2.6 (16) unstable; urgency=low
 
   * Rebuild to pick up new images