r4030 - people/waldi/kernel/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: 2005-08-23 17:13:06 +0000 (Tue, 23 Aug 2005)
New Revision: 4030

Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Use dict for makeflags.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 17:02:41 UTC (rev 4029)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 17:13:06 UTC (rev 4030)
@@ -242,7 +242,7 @@
               f.write(" %s\n" % k)
         f.write('\n')
 
-def process_real_arch(packages, makefile, config, version, abiname, kpkg_abiname, arch, vars, makeflags):
+def process_real_arch(packages, makefile, config, arch, vars, makeflags):
     config_entry = config[arch]
 
     vars['arch'] = arch
@@ -255,15 +255,17 @@
     for i in (('setup',)):
         makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
 
-    makeflags.append("ARCH='%s'" % arch)
+    makeflags['ARCH'] = arch
+    makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
     cmds_setup = []
-    cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % ' '.join(makeflags),))
+    cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch %s" % makeflags_string,))
     makefile.append(("setup-%s-real:" % arch, cmds_setup))
 
     for subarch in config_entry['subarches']:
-        process_real_subarch(packages, makefile, config, version, abiname, kpkg_abiname, arch, subarch, vars.copy(), makeflags[:])
+        process_real_subarch(packages, makefile, config, arch, subarch, vars.copy(), makeflags.copy())
 
-def process_real_flavour(packages, makefile, config, version, abiname, kpkg_abiname, arch, subarch, flavour, vars, makeflags):
+def process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars, makeflags):
     config_entry = config['-'.join((arch, subarch, flavour))]
 
     vars['flavour'] = flavour
@@ -288,16 +290,18 @@
         makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour), None))
         makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
 
-    makeflags.append("FLAVOUR='%s'" % flavour)
+    makeflags['FLAVOUR'] = flavour
     if config_entry.has_key('kpkg-subarch'):
-        makeflags.append("KPKG_SUBARCH='%s'" % config_entry['kpkg-subarch'])
+        makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+    makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
     cmds_binary_arch = []
-    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % ' '.join(makeflags),))
+    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
     cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in dummy_packages]),))
     cmds_build = []
-    cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % ' '.join(makeflags),))
+    cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
     cmds_setup = []
-    cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % ' '.join(makeflags),))
+    cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
     makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
     makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
     makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
@@ -312,17 +316,21 @@
     tree = read_template("tree")
     packages.append(process_real_tree(tree[0], changelog, vars))
 
-    makeflags = [
-        "VERSION='%s'" % version['version'],
-        "SOURCE_VERSION='%s'" % version['source'],
-        "UPSTREAM_VERSION='%s'" % version['upstream'],
-    ]
+    makeflags = {
+        'VERSION': version['version'],
+        'SOURCE_VERSION': version['source'],
+        'UPSTREAM_VERSION': version['upstream'],
+        'ABINAME': abiname,
+        'KPKG_ABINAME': kpkg_abiname,
+    }
+    makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
     cmds_binary_indep = []
-    cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % ' '.join(makeflags),))
+    cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags_string,))
     makefile.append(("binary-indep:", cmds_binary_indep))
 
     for arch in iter(config['base']['arches']):
-        process_real_arch(packages, makefile, config, version, abiname, kpkg_abiname, arch, vars.copy(), makeflags[:])
+        process_real_arch(packages, makefile, config, arch, vars.copy(), makeflags.copy())
 
     extra = read_template("extra")
     packages.extend(process_packages(extra, vars))
@@ -347,7 +355,7 @@
         makefile.append(("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch), None))
         makefile.append(("binary-arch-%s-extra:" % arch, cmds))
 
-def process_real_subarch(packages, makefile, config, version, abiname, kpkg_abiname, arch, subarch, vars, makeflags):
+def process_real_subarch(packages, makefile, config, arch, subarch, vars, makeflags):
     if subarch == 'none':
         vars['subarch'] = ''
         config_entry = config[arch]
@@ -361,24 +369,20 @@
     for i in ('binary-arch', 'setup'):
         makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch), None))
 
-    makeflags.extend([
-        "SUBARCH='%s'" % subarch,
-        "ABINAME='%s'" % abiname,
-        "KPKG_ABINAME='%s'" % kpkg_abiname,
-    ])
-    makeflags_clean = makeflags[:]
+    makeflags['SUBARCH'] = subarch
     if config_entry.has_key('kpkg-subarch'):
-        makeflags.append("KPKG_SUBARCH='%s'" % config_entry['kpkg-subarch'])
+        makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+    makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
     cmds_binary_arch = []
-    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % ' '.join(makeflags),))
+    cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags_string,))
     cmds_setup = []
-    cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % ' '.join(makeflags),))
+    cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % makeflags_string,))
     makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
     makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
     for flavour in config_entry['flavours']:
-        process_real_flavour(packages, makefile, config, version, abiname, kpkg_abiname, arch, subarch, flavour, vars.copy(), makeflags[:])
+        process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars.copy(), makeflags.copy())
 
 def main():
     changelog = read_changelog()