Author: waldi
Date: Sun Oct 1 21:10:33 2006
New Revision: 7570
Modified:
dists/trunk/linux-2.6/debian/modules/gencontrol.py
Log:
debian/modules/gencontrol.py
- Really exclude module-less flavours.
- Fix multi-arch packages.
Modified: dists/trunk/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/gencontrol.py (original)
+++ dists/trunk/linux-2.6/debian/modules/gencontrol.py Sun Oct 1 21:10:33 2006
@@ -24,6 +24,13 @@
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 @@
package['Architecture'] = [arch]
packages.append(package)
- packages.extend(modules)
-
makeflags_string = ' '.join(["%s='%s'" % i for i in
makeflags.iteritems()])
cmds_binary_arch = []
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
