[kernel] r4808 - in people/waldi/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 16:08:53 2005
New Revision: 4808

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/bin/gencontrol.py: Move code from debian/lib/python/debian_linux/gencontrol.py.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sun Nov 13 16:08:53 2005
@@ -4,6 +4,35 @@
 import debian_linux.gencontrol
 
 class gencontrol(debian_linux.gencontrol.gencontrol):
+    def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
+        headers_arch = self.templates["control.headers.arch"]
+        package_headers_arch = self.process_package(headers_arch[0], vars)
+        extra['headers_arch_depends'] = []
+
+        name = package_headers_arch['Package']
+        if packages.has_key(name):
+            package_headers_arch = packages.get(name)
+            package_headers_arch['Architecture'][1].append(arch)
+        else:
+            package_headers_arch['Architecture'] = (' ', [arch])
+            packages.append(package_headers_arch)
+
+        makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
+        cmds_setup = []
+        cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % makeflags_string,))
+        makefile.append(("setup-%s-real:" % arch, cmds_setup))
+
+    def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
+        config_entry = self.config[arch,]
+        makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
+        # Append this here so it only occurs on the install-headers-all line
+        makeflags_string += " FLAVOURS='%s' " % ' '.join(['%s' % i for i in config_entry['flavours']])
+        cmds_binary_arch = []
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(extra['headers_arch_depends']), makeflags_string),))
+        makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
+
     def do_subarch_makeflags(self, makeflags, arch, subarch):
         config_entry = self.config[arch, subarch]
         for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:

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 16:08:53 2005
@@ -119,33 +119,10 @@
             makefile.append("%s-%s:: %s-%s-real" % (i, arch, i, arch))
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
-        headers_arch = self.templates["control.headers.arch"]
-        package_headers_arch = self.process_package(headers_arch[0], vars)
-        extra['headers_arch_depends'] = []
-
-        name = package_headers_arch['Package']
-        if packages.has_key(name):
-            package_headers_arch = packages.get(name)
-            package_headers_arch['Architecture'][1].append(arch)
-        else:
-            package_headers_arch['Architecture'] = (' ', [arch])
-            packages.append(package_headers_arch)
-
-        makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
-
-        cmds_setup = []
-        cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % makeflags_string,))
-        makefile.append(("setup-%s-real:" % arch, cmds_setup))
+        pass
 
     def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
-        config_entry = self.config[arch,]
-        makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
-
-        # Append this here so it only occurs on the install-headers-all line
-        makeflags_string += " FLAVOURS='%s' " % ' '.join(['%s' % i for i in config_entry['flavours']])
-        cmds_binary_arch = []
-        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-headers-all GENCONTROL_ARGS='\"-Vkernel:Depends=%s\"' %s" % (', '.join(extra['headers_arch_depends']), makeflags_string),))
-        makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
+        pass
 
     def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
         if subarch == 'none':