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

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 12:05:45 2006
New Revision: 6011

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,
debian/lib/python/debian_linux/gencontrol.py
- Don't export the usage of the image section into the generic code.
- Fix localversion spec.


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	Thu Mar  2 12:05:45 2006
@@ -41,15 +41,12 @@
         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.merge('base', arch, subarch)
+    def do_subarch_setup(self, vars, makeflags, arch, subarch):
+        vars.update(self.config.get(('image', arch, subarch), {}))
         for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
-            if config_entry.has_key(i[0]):
-                makeflags[i[1]] = config_entry[i[0]]
-        localversion_headers = ''
-        if subarch != 'none':
-            localversion_headers = '-' + subarch
-        makeflags['LOCALVERSION_HEADERS'] = localversion_headers
+            if vars.has_key(i[0]):
+                makeflags[i[1]] = vars[i[0]]
+        vars['localversion_headers'] = vars['localversion']
 
     def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
         headers_subarch = self.templates["control.headers.subarch"]
@@ -73,9 +70,8 @@
         makefile.append("build-%s-%s-real:" % (arch, subarch))
         makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
-    def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
-        config_entry = self.config.merge('base', arch, subarch, flavour)
-        config_entry.update(self.config.merge('image', arch, subarch, flavour))
+    def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour):
+        vars.update(self.config.get(('image', arch, subarch, flavour), {}))
         for i in (
             ('compiler', 'COMPILER'),
             ('kernel-arch', 'KERNEL_ARCH'),
@@ -86,16 +82,10 @@
             ('initramfs', 'INITRAMFS',),
             ('type', 'TYPE'),
         ):
-            if config_entry.has_key(i[0]):
-                makeflags[i[1]] = config_entry[i[0]]
-        localversion = ''
-        localversion_headers = ''
-        if subarch != 'none':
-            localversion = '-' + subarch
-            localversion_headers = '-' + subarch
-        localversion += '-' + flavour
-        makeflags['LOCALVERSION'] = localversion
-        makeflags['LOCALVERSION_HEADERS'] = localversion_headers
+            if vars.has_key(i[0]):
+                makeflags[i[1]] = vars[i[0]]
+        makeflags['LOCALVERSION'] = vars['localversion']
+        makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers']
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         image = self.templates["control.image"]

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	Thu Mar  2 12:05:45 2006
@@ -101,9 +101,9 @@
         extra = {}
         makeflags['ARCH'] = arch
 
-        vars['localversion'] = vars['localversion_headers'] = vars['abiname']
+        vars['localversion'] = vars['abiname']
 
-        self.do_arch_makeflags(makeflags, arch)
+        self.do_arch_setup(vars, makeflags, arch)
         self.do_arch_makefile(makefile, arch, makeflags)
         self.do_arch_packages(packages, makefile, arch, vars, makeflags, extra)
 
@@ -112,7 +112,7 @@
 
         self.do_arch_packages_post(packages, makefile, arch, vars, makeflags, extra)
 
-    def do_arch_makeflags(self, makeflags, arch):
+    def do_arch_setup(self, vars, makeflags, arch):
         pass
 
     def do_arch_makefile(self, makefile, arch, makeflags):
@@ -134,16 +134,15 @@
         makeflags['SUBARCH'] = subarch
         if subarch != 'none':
             vars['localversion'] += '-' + subarch
-            vars['localversion_headers'] += '-' + subarch
 
-        self.do_subarch_makeflags(makeflags, arch, subarch)
+        self.do_subarch_setup(vars, makeflags, arch, subarch)
         self.do_subarch_makefile(makefile, arch, subarch, makeflags)
         self.do_subarch_packages(packages, makefile, arch, subarch, vars, makeflags, extra)
 
         for flavour in config_entry['flavours']:
             self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), extra)
 
-    def do_subarch_makeflags(self, makeflags, arch, subarch):
+    def do_subarch_setup(self, vars, makeflags, arch, subarch):
         pass
 
     def do_subarch_makefile(self, makefile, arch, subarch, makeflags):
@@ -178,11 +177,11 @@
         makeflags['FLAVOUR'] = flavour
         vars['localversion'] += '-' + flavour
 
-        self.do_flavour_makeflags(makeflags, arch, subarch, flavour)
+        self.do_flavour_setup(vars, makeflags, arch, subarch, flavour)
         self.do_flavour_makefile(makefile, arch, subarch, flavour, makeflags)
         self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
 
-    def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
+    def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour):
         config_entry = self.config.merge('base', arch, subarch, flavour)
         for i in (
             ('compiler', 'COMPILER'),