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

[Bastian Blank]

Author: waldi
Date: Wed Jul 19 23:59:48 2006
New Revision: 7055

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

Log:
debian/bin/gencontrol.py: Move module loop after flavour loop.


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:59:48 2006
@@ -11,21 +11,6 @@
         self.process_config_version(config.config_parser({}, [sys.argv[1] + "/version"]))
         self.config = config_reader_modules(self.config)
 
-    def do_main(self, packages, makefile):
-        config_entry = self.config['base',]
-        vars = self.vars.copy()
-        vars.update(config_entry)
-
-        makeflags = {}
-        extra = {}
-
-        self.do_main_setup(vars, makeflags, extra)
-        self.do_main_packages(packages, extra)
-        self.do_main_makefile(makefile, makeflags, extra)
-
-        for module in iter(self.config['base',]['modules']):
-            self.do_module(module, packages, makefile, vars.copy(), makeflags.copy(), extra)
-
     def do_main_packages(self, packages, extra):
         vars = self.vars
 
@@ -37,19 +22,27 @@
             for arch in self.config['base',]['arches']],
         )
 
-    def do_module(self, module, packages, makefile, vars, makeflags, extra):
+    def do_flavour(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
+
+        super(gencontrol, self).do_flavour(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
+
+        for module in iter(self.config['base',]['modules']):
+            self.do_module(module, packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), extra)
+
+    def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags, extra):
+        for i in self.makefile_targets:
+            makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour))
+
+    def do_module(self, module, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         config_entry = self.config['base', module]
         vars.update(config_entry)
         vars['module'] = module
-        extra['module'] = module
         makeflags['MODULE'] = module
 
-        for arch in iter(self.config.merge('base', module)['arches']):
-            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:
+        if arch not in config_entry.get('arches', [arch]):
             return
 
         modules = self.templates["control.modules"]
@@ -74,9 +67,11 @@
         cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
         cmds_setup = []
         cmds_setup.append(("$(MAKE) -f debian/rules.real setup %s" % makeflags_string,))
-        makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
-        makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
-        makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
+        for i in self.makefile_targets:
+            makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-%s" % (i, arch, subarch, flavour, i, arch, subarch, flavour, module))
+        makefile.append(("binary-arch-%s-%s-%s-%s:" % (arch, subarch, flavour, module), cmds_binary_arch))
+        makefile.append(("build-%s-%s-%s-%s:" % (arch, subarch, flavour, module), cmds_build))
+        makefile.append(("setup-%s-%s-%s-%s:" % (arch, subarch, flavour, module), cmds_setup))
 
     def process_config_version(self, config):
         entry = config['version',]