[kernel] r6331 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Wed Mar 29 11:44:51 2006
New Revision: 6331

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
Log:
* debian/bin/gencontrol.py: Disabled modules support disabled headers as well.
* debian/lib/python/debian_linux/config.py: Add new entries.


Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Wed Mar 29 11:44:51 2006
@@ -125,7 +125,7 @@
         packages_own.append(self.process_real_image(image[0], image_depends, vars))
         packages_dummy.extend(self.process_packages(image_latest, vars))
 
-        if self.config.merge('headers', arch, subarch, flavour).get('enable', True):
+        if vars.get('modules', True):
             packages_own.append(self.process_package(headers[0], vars))
             packages_dummy.append(self.process_package(headers_latest[0], vars))
             extra['headers_arch_depends'].append('%s (= ${Source-Version})' % packages_own[-1]['Package'])

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	Wed Mar 29 11:44:51 2006
@@ -33,6 +33,7 @@
         'available': schema_item_boolean(),
         'flavours': schema_item_list(),
         'initramfs': schema_item_boolean(),
+        'modules': schema_item_boolean(),
         'initramfs-generators': schema_item_list(),
         'subarches': schema_item_list(),
     }