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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 15:26:03 2005
New Revision: 4800

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


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:26:03 2005
@@ -139,8 +139,19 @@
         config_entry = self.config[arch, subarch]
         vars.update(config_entry)
 
-        headers_subarch = self.templates["control.headers.subarch"]
+        makeflags['SUBARCH'] = subarch
+        for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
+            if config_entry.has_key(i[0]):
+                makeflags[i[1]] = config_entry[i[0]]
+
+        self.do_subarch_packages(packages, arch, subarch, vars)
+        self.do_subarch_makefile(makefile, arch, subarch, makeflags)
+
+        for flavour in config_entry['flavours']:
+            self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), package_headers_arch_depends)
 
+    def do_subarch_packages(self, packages, arch, subarch, vars):
+        headers_subarch = self.templates["control.headers.subarch"]
         package_headers = self.process_package(headers_subarch[0], vars)
 
         name = package_headers['Package']
@@ -151,16 +162,13 @@
             package_headers['Architecture'] = (' ', [arch])
             packages.append(package_headers)
 
+    def do_subarch_makefile(self, makefile, arch, subarch, makeflags):
         for i in ('binary-arch', 'build', 'setup'):
             makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch), None))
             makefile.append(("%s-%s-%s::" % (i, arch, subarch), None))
         for i in ('binary-arch', 'setup'):
             makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch), None))
 
-        makeflags['SUBARCH'] = subarch
-        for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
-            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 = []
@@ -170,9 +178,6 @@
         makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
         makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
-        for flavour in config_entry['flavours']:
-            self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), package_headers_arch_depends)
-
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
         config_entry = self.config[arch, subarch, flavour]
         vars.update(config_entry)