diff options
| author | Bastian Blank <waldi@debian.org> | 2008-05-11 18:37:03 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2008-05-11 18:37:03 +0000 |
| commit | 8aec23954baa06a7de0816870438150b3462767c (patch) | |
| tree | 859568a1b8fda3a2e6d2ccd55aabc6c615415b67 /debian/lib/python | |
| parent | 97084867c6f45df7ecfcbb52fb6d0a0feba11446 (diff) | |
| download | kernel_replicant_linux-8aec23954baa06a7de0816870438150b3462767c.tar.gz kernel_replicant_linux-8aec23954baa06a7de0816870438150b3462767c.tar.bz2 kernel_replicant_linux-8aec23954baa06a7de0816870438150b3462767c.zip | |
* debian/bin/gencontrol.py: Fix small problem.
* debian/lib/python/debian_linux/gencontrol.py: Further cleanups.
svn path=/dists/trunk/linux-2.6/; revision=11355
Diffstat (limited to 'debian/lib/python')
| -rw-r--r-- | debian/lib/python/debian_linux/gencontrol.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 724bf1fca39f..713ec3cba5d4 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -145,8 +145,6 @@ class Gencontrol(object): def do_arch(self, packages, makefile, arch, vars, makeflags, extra): vars['arch'] = arch - makeflags['ARCH'] = arch - self.do_arch_setup(vars, makeflags, arch, extra) self.do_arch_makefile(makefile, arch, makeflags, extra) self.do_arch_packages(packages, makefile, arch, vars, makeflags, extra) @@ -156,6 +154,8 @@ class Gencontrol(object): pass def do_arch_makefile(self, makefile, arch, makeflags, extra): + makeflags['ARCH'] = arch + for i in self.makefile_targets: target1 = i target2 = '_'.join((target1, arch)) @@ -175,8 +175,6 @@ class Gencontrol(object): if not config_base.get('enabled', True): return - makeflags['FEATURESET'] = featureset - vars['localversion'] = '' if featureset != 'none': vars['localversion'] = '-' + featureset @@ -190,6 +188,8 @@ class Gencontrol(object): pass def do_featureset_makefile(self, makefile, arch, featureset, makeflags, extra): + makeflags['FEATURESET'] = featureset + for i in self.makefile_targets: target1 = '_'.join((i, arch)) target2 = '_'.join((target1, featureset)) @@ -207,10 +207,10 @@ class Gencontrol(object): def do_flavour(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra): config_base = self.config.merge('base', arch, featureset, flavour) - makeflags['FLAVOUR'] = flavour - vars['class'] = config_base['class'] if not vars.has_key('longclass'): +# from warnings import warn +# warn("Image lacks longclass setting: %s, %s, %s" % (arch, featureset, flavour), UserWarning, stacklevel = 1) vars['longclass'] = vars['class'] vars['localversion'] += '-' + flavour @@ -228,6 +228,8 @@ class Gencontrol(object): makeflags[i[1]] = vars[i[0]] def do_flavour_makefile(self, makefile, arch, featureset, flavour, makeflags, extra): + makeflags['FLAVOUR'] = flavour + for i in self.makefile_targets: target1 = '_'.join((i, arch, featureset)) target2 = '_'.join((target1, flavour)) |