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

[Bastian Blank]

Author: waldi
Date: Fri Mar 10 19:22:23 2006
New Revision: 6122

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
* debian/bin/gencontrol.py: Also read arch specific image section.
* debian/lib/python/debian_linux/gencontrol.py:
  Don't even try to look into the image section.s


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	Fri Mar 10 19:22:23 2006
@@ -17,6 +17,9 @@
         tree = self.templates["control.tree"]
         packages.append(self.process_real_tree(tree[0], vars))
 
+    def do_arch_setup(self, vars, makeflags, arch):
+        vars.update(self.config.get(('image', arch), {}))
+
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
         headers_arch = self.templates["control.headers.arch"]
         package_headers_arch = self.process_package(headers_arch[0], vars)

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	Fri Mar 10 19:22:23 2006
@@ -96,7 +96,6 @@
     def do_arch(self, packages, makefile, arch, vars, makeflags):
         config_entry = self.config['base', arch]
         vars.update(config_entry)
-        vars.update(self.config['image', arch])
 
         if not config_entry.get('available', True):
             for i in self.makefile_targets:
@@ -135,7 +134,6 @@
     def do_subarch(self, packages, makefile, arch, subarch, vars, makeflags, extra):
         config_entry = self.config['base', arch, subarch]
         vars.update(config_entry)
-        vars.update(self.config.get(('image', arch, subarch), {}))
 
         makeflags['SUBARCH'] = subarch
         if subarch != 'none':
@@ -163,7 +161,6 @@
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         config_entry = self.config['base', arch, subarch, flavour]
         vars.update(config_entry)
-        vars.update(self.config.get(('image', arch, subarch, flavour), {}))
 
         if not vars.has_key('class'):
             warnings.warn('No class entry in config for flavour %s, subarch %s, arch %s' % (flavour, subarch, arch), DeprecationWarning)