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

[Bastian Blank]

Author: waldi
Date: Sun May 11 18:26:27 2008
New Revision: 11354

Log:
* debian/bin/gencontrol.py: Remove further "vars" updates.
* debian/lib/python/debian_linux/gencontrol.py: Cleanup.


Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

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	Sun May 11 18:26:27 2008
@@ -31,7 +31,6 @@
 
     def do_arch_setup(self, vars, makeflags, arch, extra):
         config_base = self.config.merge('base', arch)
-        vars.update(self.config.merge('image', arch))
         config_libc_dev = self.config.merge('libc-dev', arch)
         makeflags['LIBC_DEV_ARCH'] = config_libc_dev.get('arch', config_base.get('kernel-arch'))
 
@@ -81,22 +80,25 @@
         makefile.add('source_%s_%s_real' % (arch, featureset), cmds = cmds_source)
 
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
+        config_base = self.config.merge('base', arch, featureset, flavour)
         config_image = self.config.merge('image', arch, featureset, flavour)
 
-        vars.update(config_image)
-
         vars['localversion-image'] = vars['localversion']
         override_localversion = config_image.get('override-localversion', None)
         if override_localversion is not None:
             vars['localversion-image'] = vars['localversion_headers'] + '-' + override_localversion
 
+        data = vars.copy()
+        data.update(config_base)
+        data.update(config_image)
+
         for i in (
             ('compiler', 'COMPILER'),
             ('kernel-arch', 'KERNEL_ARCH'),
             ('localversion', 'LOCALVERSION'),
             ('type', 'TYPE'),
         ):
-            makeflags[i[1]] = vars[i[0]]
+            makeflags[i[1]] = data[i[0]]
         for i in (
             ('cflags', 'CFLAGS'),
             ('initramfs', 'INITRAMFS'),
@@ -105,8 +107,8 @@
             ('localversion-image', 'LOCALVERSION_IMAGE'),
             ('override-host-type', 'OVERRIDE_HOST_TYPE'),
         ):
-            if vars.has_key(i[0]):
-                makeflags[i[1]] = vars[i[0]]
+            if data.has_key(i[0]):
+                makeflags[i[1]] = data[i[0]]
         makeflags['KERNEL_HEADER_DIRS'] = vars.get('kernel-header-dirs', vars.get('kernel-arch'))
 
     def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):

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	Sun May 11 18:26:27 2008
@@ -143,7 +143,6 @@
             makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
 
     def do_arch(self, packages, makefile, arch, vars, makeflags, extra):
-        config_base = self.config['base', arch]
         vars['arch'] = arch
 
         makeflags['ARCH'] = arch
@@ -173,8 +172,6 @@
 
     def do_featureset(self, packages, makefile, arch, featureset, vars, makeflags, extra):
         config_base = self.config.merge('base', arch, featureset)
-        vars.update(config_base)
-
         if not config_base.get('enabled', True):
             return
 
@@ -209,12 +206,13 @@
 
     def do_flavour(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         config_base = self.config.merge('base', arch, featureset, flavour)
-        vars.update(config_base)
 
+        makeflags['FLAVOUR'] = flavour
+
+        vars['class'] = config_base['class']
         if not vars.has_key('longclass'):
             vars['longclass'] = vars['class']
 
-        makeflags['FLAVOUR'] = flavour
         vars['localversion'] += '-' + flavour
 
         self.do_flavour_setup(vars, makeflags, arch, featureset, flavour, extra)