From f4739f80c2fa2b51a00959d7f4eb5f4d1e0263d4 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Fri, 3 Mar 2006 15:58:44 +0000
Subject: [PATCH] * debian/bin/gencontrol.py: Add LOCALVERSION with the same
 rules than anything else. * debian/lib/python/debian_linux/gencontrol.py:
 Export LOCALVERSION.

svn path=/dists/trunk/linux-2.6/; revision=6041
---
 debian/bin/gencontrol.py                     | 14 ++++++++------
 debian/lib/python/debian_linux/gencontrol.py |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 46b3ea274..4bdd33539 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -46,11 +46,13 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
 
     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 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
         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"]
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 5b5c47585..2fbaf41e6 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -185,13 +185,13 @@ class gencontrol(object):
         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'):