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

[Bastian Blank]

Author: waldi
Date: 2005-08-23 17:38:05 +0000 (Tue, 23 Aug 2005)
New Revision: 4034

Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Readd setup of variables for template substitution.


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:33:50 UTC (rev 4033)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 17:38:05 UTC (rev 4034)
@@ -246,9 +246,8 @@
 
 def process_real_arch(packages, makefile, config, arch, vars, makeflags):
     config_entry = config[arch]
+    vars.update(config_entry)
 
-    vars['arch'] = arch
-
     if not config_entry.get('available', True):
         for i in ('binary-arch', 'build', 'setup'):
             makefile.append(("%s-%s:" % (i, arch), ["@echo Architecture %s is not available!" % arch, "@exit 1"]))
@@ -269,6 +268,7 @@
 
 def process_real_flavour(packages, makefile, config, arch, subarch, flavour, vars, makeflags):
     config_entry = config['-'.join((arch, subarch, flavour))]
+    vars.update(config_entry)
 
     vars['flavour'] = flavour
     if not vars.has_key('class'):
@@ -374,6 +374,7 @@
     else:
         vars['subarch'] = '%s-' % subarch
         config_entry = config['%s-%s' % (arch, subarch)]
+    vars.update(config_entry)
 
     headers_subarch = read_template("headers.subarch")