debian/bin/gencontrol.py:
Move some package specific stuff from lib/python/debian_linux/gencontrol.py. svn path=/dists/sid/linux/; revision=19145
This commit is contained in:
parent
157024aa14
commit
7a338d9536
|
@ -60,11 +60,7 @@ class Gencontrol(Base):
|
||||||
'SOURCEVERSION': self.version.complete,
|
'SOURCEVERSION': self.version.complete,
|
||||||
})
|
})
|
||||||
|
|
||||||
def do_main_packages(self, packages, vars, makeflags, extra):
|
def do_main_makefile(self, makefile, makeflags, extra):
|
||||||
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
|
|
||||||
|
|
||||||
def do_main_recurse(self, packages, makefile, vars, makeflags, extra):
|
|
||||||
# Add featureset source rules
|
|
||||||
for featureset in iter(self.config['base', ]['featuresets']):
|
for featureset in iter(self.config['base', ]['featuresets']):
|
||||||
makeflags_featureset = makeflags.copy()
|
makeflags_featureset = makeflags.copy()
|
||||||
makeflags_featureset['FEATURESET'] = featureset
|
makeflags_featureset['FEATURESET'] = featureset
|
||||||
|
@ -75,7 +71,12 @@ class Gencontrol(Base):
|
||||||
['source_%s_real' % featureset])
|
['source_%s_real' % featureset])
|
||||||
makefile.add('source', ['source_%s' % featureset])
|
makefile.add('source', ['source_%s' % featureset])
|
||||||
|
|
||||||
super(Gencontrol, self).do_main_recurse(packages, makefile, vars, makeflags, extra)
|
makeflags = makeflags.copy()
|
||||||
|
makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
|
||||||
|
super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
|
||||||
|
|
||||||
|
def do_main_packages(self, packages, vars, makeflags, extra):
|
||||||
|
packages.extend(self.process_packages(self.templates["control.main"], self.vars))
|
||||||
|
|
||||||
arch_makeflags = (
|
arch_makeflags = (
|
||||||
('kernel-arch', 'KERNEL_ARCH', False),
|
('kernel-arch', 'KERNEL_ARCH', False),
|
||||||
|
|
|
@ -114,8 +114,6 @@ class Gencontrol(object):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def do_main_makefile(self, makefile, makeflags, extra):
|
def do_main_makefile(self, makefile, makeflags, extra):
|
||||||
makeflags = makeflags.copy()
|
|
||||||
makeflags['ALL_FEATURESETS'] = ' '.join(self.config['base', ]['featuresets'])
|
|
||||||
makefile.add('binary-indep', cmds=["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
|
makefile.add('binary-indep', cmds=["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
|
||||||
|
|
||||||
def do_main_packages(self, packages, vars, makeflags, extra):
|
def do_main_packages(self, packages, vars, makeflags, extra):
|
||||||
|
|
Loading…
Reference in New Issue