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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 15:32:58 2005
New Revision: 4801

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:32:58 2005
@@ -144,13 +144,20 @@
             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)
+        self.do_subarch_packages(packages, makefile, arch, subarch, vars, 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):
+    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', 'build', 'setup'):
+            makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch), None))
+
+    def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags):
         headers_subarch = self.templates["control.headers.subarch"]
         package_headers = self.process_package(headers_subarch[0], vars)
 
@@ -162,13 +169,9 @@
             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))
+        self.do_subarch_packages_makefile(makefile, arch, subarch, makeflags)
 
+    def do_subarch_packages_makefile(self, makefile, arch, subarch, makeflags):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_arch = []
@@ -176,6 +179,7 @@
         cmds_setup = []
         cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % makeflags_string,))
         makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
+        makefile.append(("build-%s-%s-real:" % (arch, subarch), None))
         makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):