[kernel] r6041 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Fri Mar  3 15:58:44 2006
New Revision: 6041

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
* debian/bin/gencontrol.py: Add LOCALVERSION with the same rules than anything else.
* debian/lib/python/debian_linux/gencontrol.py: Export LOCALVERSION.


Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Fri Mar  3 15:58:44 2006
@@ -46,11 +46,13 @@
 
     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'),:
+        vars['localversion_headers'] = vars['localversion']
+        for i in (
+            ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
+            ('localversion_headers', 'LOCALVERSION_HEADERS'),
+        ):
             if vars.has_key(i[0]):
                 makeflags[i[1]] = vars[i[0]]
-        vars['localversion_headers'] = vars['localversion']
-        makeflags['LOCALVERSION_HEADERS'] = vars['localversion_headers']
 
     def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
         headers_subarch = self.templates["control.headers.subarch"]
@@ -78,17 +80,17 @@
         vars.update(self.config.get(('image', arch, subarch, flavour), {}))
         for i in (
             ('compiler', 'COMPILER'),
+            ('image-postproc', 'IMAGE_POSTPROC'),
+            ('initramfs', 'INITRAMFS',),
             ('kernel-arch', 'KERNEL_ARCH'),
             ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
-            ('image-postproc', 'IMAGE_POSTPROC'),
-            ('initramfs', 'INITRAMFS',),
+            ('localversion', 'LOCALVERSION'),
             ('type', 'TYPE'),
         ):
             if vars.has_key(i[0]):
                 makeflags[i[1]] = vars[i[0]]
-        makeflags['LOCALVERSION'] = vars['localversion']
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         image = self.templates["control.image"]

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Fri Mar  3 15:58:44 2006
@@ -185,13 +185,13 @@
         self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, extra)
 
     def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour):
-        config_entry = self.config.merge('base', arch, subarch, flavour)
         for i in (
             ('compiler', 'COMPILER'),
-            ('kernel-arch', 'KERNEL_ARCH')
+            ('kernel-arch', 'KERNEL_ARCH'),
+            ('localversion', 'LOCALVERSION'),
         ):  
-            if config_entry.has_key(i[0]):
-                makeflags[i[1]] = config_entry[i[0]]
+            if vars.has_key(i[0]):
+                makeflags[i[1]] = vars[i[0]]
 
     def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags):
         for i in ('binary-arch', 'build', 'setup'):