diff options
| author | Ben Hutchings <benh@debian.org> | 2012-12-16 15:35:51 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-12-16 15:35:51 +0000 |
| commit | 72dfd72c360a2cdac4d82be86090d79198c57951 (patch) | |
| tree | 82bfe161ae4ccfe916fda1592a55d3caa9e1359b | |
| parent | 8123ace851707cad1ea78ea2330e62928f3a7fa1 (diff) | |
| download | kernel_replicant_linux-72dfd72c360a2cdac4d82be86090d79198c57951.tar.gz kernel_replicant_linux-72dfd72c360a2cdac4d82be86090d79198c57951.tar.bz2 kernel_replicant_linux-72dfd72c360a2cdac4d82be86090d79198c57951.zip | |
Do not try to apply featureset patches when featureset is disabled
svn path=/dists/trunk/linux/; revision=19609
| -rwxr-xr-x | debian/bin/gencontrol.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 0c25d3e735ad..dd2a50cf5141 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -60,7 +60,10 @@ class Gencontrol(Base): }) 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 @@ class Gencontrol(Base): 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): |