From 7a338d9536ff3a373806c3575d0b9d71caad3c13 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 13 Jun 2012 21:54:55 +0000 Subject: [PATCH] debian/bin/gencontrol.py: Move some package specific stuff from lib/python/debian_linux/gencontrol.py. svn path=/dists/sid/linux/; revision=19145 --- debian/bin/gencontrol.py | 13 +++++++------ debian/lib/python/debian_linux/gencontrol.py | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index d7235c5a4..c0876a304 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -60,11 +60,7 @@ class Gencontrol(Base): 'SOURCEVERSION': self.version.complete, }) - def do_main_packages(self, packages, vars, 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 + def do_main_makefile(self, makefile, makeflags, extra): for featureset in iter(self.config['base', ]['featuresets']): makeflags_featureset = makeflags.copy() makeflags_featureset['FEATURESET'] = featureset @@ -75,7 +71,12 @@ class Gencontrol(Base): ['source_%s_real' % 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 = ( ('kernel-arch', 'KERNEL_ARCH', False), diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index b10dfadba..389af7027 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -114,8 +114,6 @@ class Gencontrol(object): pass 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]) def do_main_packages(self, packages, vars, makeflags, extra):