From 97084867c6f45df7ecfcbb52fb6d0a0feba11446 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 11 May 2008 18:26:27 +0000 Subject: [PATCH] * debian/bin/gencontrol.py: Remove further "vars" updates. * debian/lib/python/debian_linux/gencontrol.py: Cleanup. svn path=/dists/trunk/linux-2.6/; revision=11354 --- debian/bin/gencontrol.py | 14 ++++++++------ debian/lib/python/debian_linux/gencontrol.py | 8 +++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index ca842a8b6..bd0e208a4 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -31,7 +31,6 @@ class Gencontrol(Base): 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 @@ class Gencontrol(Base): 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 @@ class Gencontrol(Base): ('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): diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 524644a00..724bf1fca 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -143,7 +143,6 @@ class Gencontrol(object): 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 @@ class Gencontrol(object): 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 @@ class Gencontrol(object): 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)