[kernel] r19609 - dists/trunk/linux/debian/bin

[Ben Hutchings]

Author: benh
Date: Sun Dec 16 15:35:51 2012
New Revision: 19609

Log:
Do not try to apply featureset patches when featureset is disabled

Modified:
   dists/trunk/linux/debian/bin/gencontrol.py

Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py	Sun Dec 16 15:20:29 2012	(r19608)
+++ dists/trunk/linux/debian/bin/gencontrol.py	Sun Dec 16 15:35:51 2012	(r19609)
@@ -60,7 +60,10 @@
         })
 
     def do_main_makefile(self, makefile, makeflags, extra):
-        for featureset in iter(self.config['base', ]['featuresets']):
+        fs_enabled = [featureset
+                      for featureset in self.config['base', ]['featuresets']
+                      if self.config.merge('base', None, featureset).get('enabled', True)]
+        for featureset in fs_enabled:
             makeflags_featureset = makeflags.copy()
             makeflags_featureset['FEATURESET'] = featureset
             cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
@@ -71,7 +74,7 @@
             makefile.add('source', ['source_%s' % featureset])
 
         makeflags = makeflags.copy()
-        makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
+        makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled)
         super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
 
     def do_main_packages(self, packages, vars, makeflags, extra):