debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Do not try to apply featureset patches when featureset is disabled 

svn path=/dists/trunk/linux/; revision=19609
This commit is contained in:
Ben Hutchings 2012-12-16 15:35:51 +00:00
parent 8123ace851
commit 72dfd72c36
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/bin/gencontrol.py vendored
View File

@ -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):