debian/modules/gencontrol.py

- Really exclude module-less flavours.
- Fix multi-arch packages.

svn path=/dists/trunk/linux-2.6/; revision=7570

1 files changed, 7 insertions, 2 deletions

diff --git a/debian/modules/gencontrol.py b/debian/modules/gencontrol.py
index 2f996e7a8..df8b9d5e7 100755
--- a/debian/modules/gencontrol.py
+++ b/debian/modules/gencontrol.py
@@ -24,6 +24,13 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
             for arch in self.config['base',]['arches']],
         )
 
+    def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
+        config_entry = self.config.merge('base', 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)
+
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         modules = self.templates["control.modules"]
         modules = self.process_packages(modules, vars)
@@ -37,8 +44,6 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
                 package['Architecture'] = [arch]
                 packages.append(package)
 
-        packages.extend(modules)
-
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_arch = []