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:
parent
4b64bf84a9
commit
1e36c722c1
|
@ -66,19 +66,14 @@ class Gencontrol(Base):
|
||||||
def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
|
def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
|
||||||
# Add featureset source rules
|
# Add featureset source rules
|
||||||
for featureset in iter(self.config['base', ]['featuresets']):
|
for featureset in iter(self.config['base', ]['featuresets']):
|
||||||
if featureset == 'none':
|
makeflags_featureset = makeflags.copy()
|
||||||
makefile.add('source_none_real',
|
makeflags_featureset['FEATURESET'] = featureset
|
||||||
cmds=['ln -s source source_none'])
|
cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
|
||||||
makefile.add('source_none', ['source_none_real'])
|
% makeflags_featureset]
|
||||||
else:
|
makefile.add('source_%s_real' % featureset, cmds=cmds_source)
|
||||||
makeflags_featureset = makeflags.copy()
|
makefile.add('source_%s' % featureset,
|
||||||
makeflags_featureset['FEATURESET'] = featureset
|
['source_%s_real' % featureset])
|
||||||
cmds_source = ["$(MAKE) -f debian/rules.real source-featureset %s"
|
makefile.add('source', ['source_%s' % featureset])
|
||||||
% 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)
|
super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra)
|
||||||
|
|
||||||
|
|
|
@ -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): DIR=$(BUILD_DIR)/source_$(FEATURESET)
|
||||||
$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
|
$(STAMPS_DIR)/source_$(FEATURESET): $(STAMPS_DIR)/source
|
||||||
rm -rf '$(DIR)'
|
rm -rf '$(DIR)'
|
||||||
|
ifeq ($(FEATURESET),none)
|
||||||
|
ln -s source '$(DIR)'
|
||||||
|
else
|
||||||
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
cp -al '$(SOURCE_DIR)' '$(DIR)'
|
||||||
$(patch_cmd) -f $(FEATURESET)
|
$(patch_cmd) -f $(FEATURESET)
|
||||||
|
endif
|
||||||
@$(stamp)
|
@$(stamp)
|
||||||
|
|
||||||
$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
|
$(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR): CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)
|
||||||
|
|
Loading…
Reference in New Issue