[kernel] r7051 - people/waldi/linux-modules-extra-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Wed Jul 19 23:32:58 2006
New Revision: 7051

Modified:
   people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py

Log:
debian/bin/gencontrol.py: Don't build modules if not supported.


Modified: people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py	Wed Jul 19 23:32:58 2006
@@ -48,6 +48,10 @@
             self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
+        config_entry = self.config.merge('base', None, arch, subarch, flavour)
+        if config_entry.get('modules', True) is False:
+            return
+
         modules = self.templates["control.modules"]
         modules = self.process_packages(modules, vars)
 
@@ -128,7 +132,8 @@
     def merge(self, section, module, *args):
         ret = {}
         ret.update(super(config_reader_modules, self).merge(section, *args))
-        ret.update(super(config_reader_modules, self).merge(section, module, *args))
+        if module:
+            ret.update(super(config_reader_modules, self).merge(section, module, *args))
         return ret
 
 if __name__ == '__main__':