[kernel] r19145 - in dists/sid/linux/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Wed Jun 13 21:54:55 2012
New Revision: 19145

Log:
debian/bin/gencontrol.py:
Move some package specific stuff from lib/python/debian_linux/gencontrol.py.

Modified:
   dists/sid/linux/debian/bin/gencontrol.py
   dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py

Modified: dists/sid/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/bin/gencontrol.py	Wed Jun 13 02:38:58 2012	(r19144)
+++ dists/sid/linux/debian/bin/gencontrol.py	Wed Jun 13 21:54:55 2012	(r19145)
@@ -60,11 +60,7 @@
             '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 @@
                          ['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),

Modified: dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py	Wed Jun 13 02:38:58 2012	(r19144)
+++ dists/sid/linux/debian/lib/python/debian_linux/gencontrol.py	Wed Jun 13 21:54:55 2012	(r19145)
@@ -114,8 +114,6 @@
         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):