[kernel] r4805 - people/waldi/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 15:52:22 2005
New Revision: 4805

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/lib/python/debian_linux/gencontrol.py: Update.


Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sun Nov 13 15:52:22 2005
@@ -196,6 +196,12 @@
             vars['longclass'] = vars['class']
 
         makeflags['FLAVOUR'] = flavour
+        self.do_flavour_makeflags(makeflags, arch, subarch, flavour)
+        self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)
+        self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends)
+
+    def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
+        config_entry = self.config[arch, subarch, flavour]
         makeflags['TYPE'] = 'kernel-package'
         for i in (
             ('compiler', 'COMPILER'),
@@ -206,9 +212,6 @@
             if config_entry.has_key(i[0]):
                 makeflags[i[1]] = config_entry[i[0]]
 
-        self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)
-        self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends)
-
     def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags):
         for i in ('binary-arch', 'build', 'setup'):
             makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour))