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

Move special case for 'none' featureset to rules.real 

This is needed to get the proper dependency.

svn path=/dists/sid/linux/; revision=19076
This commit is contained in:
Ben Hutchings 2012-06-03 22:59:24 +00:00
parent 4b64bf84a9
commit 1e36c722c1
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
debian/bin/gencontrol.py vendored
View File

@ -66,19 +66,14 @@ class Gencontrol(Base):
def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
# Add featureset source rules
for featureset in iter(self.config['base', ]['featuresets']):
if featureset == 'none':
makefile.add('source_none_real',
cmds=['ln -s source source_none'])
makefile.add('source_none', ['source_none_real'])
else:
makeflags_featureset = makeflags.copy()
makeflags_featureset['FEATURESET'] = featureset
cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
% makeflags_featureset]
makefile.add('source_%s_real' % featureset, cmds=cmds_source)
makefile.add('source_%s' % featureset,
['source_%s_real' % featureset])
makefile.add('source', ['source_%s' % featureset])
makeflags_featureset = makeflags.copy()
makeflags_featureset['FEATURESET'] = featureset
cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
% makeflags_featureset]
makefile.add('source_%s_real' % featureset, cmds=cmds_source)
makefile.add('source_%s' % featureset,
['source_%s_real' % featureset])
makefile.add('source', ['source_%s' % featureset])
super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra)

4
debian/rules.real vendored
View File

@ -86,8 +86,12 @@ $(STAMPS_DIR)/source_$(FEATURESET): SOURCE_DIR=$(BUILD_DIR)/source
$(STAMPS_DIR)/source_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(FEATURESET)
$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
rm -rf '$(DIR)'
ifeq ($(FEATURESET),none)
ln -s source '$(DIR)'
else
cp -al '$(SOURCE_DIR)' '$(DIR)'
$(patch_cmd) -f $(FEATURESET)
endif
@$(stamp)
$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)