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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 15:44:59 2005
New Revision: 4803

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:44:59 2005
@@ -192,6 +192,26 @@
         if not vars.has_key('longclass'):
             vars['longclass'] = vars['class']
 
+        makeflags['FLAVOUR'] = flavour
+        makeflags['TYPE'] = 'kernel-package'
+        for i in (
+            ('compiler', 'COMPILER'),
+            ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
+            ('kpkg-subarch', 'KPKG_SUBARCH'),
+            ('type', 'TYPE'),
+        ):
+            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))
+            makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour))
+
+    def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
         image = self.templates["control.image"]
         headers = self.templates["control.headers"]
         image_latest = self.templates["control.image.latest"]
@@ -215,20 +235,6 @@
 
         package_headers_arch_depends.append(packages_own[1]['Package'])
 
-        for i in ('binary-arch', 'build', 'setup'):
-            makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour))
-            makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour))
-
-        makeflags['FLAVOUR'] = flavour
-        makeflags['TYPE'] = 'kernel-package'
-        for i in (
-            ('compiler', 'COMPILER'),
-            ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
-            ('kpkg-subarch', 'KPKG_SUBARCH'),
-            ('type', 'TYPE'),
-        ):
-            if config_entry.has_key(i[0]):
-                makeflags[i[1]] = config_entry[i[0]]
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_arch = []