[kernel] r6482 - in dists/trunk/linux-2.6/debian: arch lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Fri Apr 28 19:34:43 2006
New Revision: 6482

Modified:
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
* debian/arch/defines: Set compiler to gcc-4.0.
* debian/lib/python/debian_linux/gencontrol.py:
  Export settings from base entry.


Modified: dists/trunk/linux-2.6/debian/arch/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/defines	Fri Apr 28 19:34:43 2006
@@ -16,6 +16,7 @@
  powerpc
  s390
  sparc
+compiler: gcc-4.0
 
 [image]
 initramfs-generators: initramfs-tools yaird
@@ -26,8 +27,8 @@
 yaird: mkinitrd.yaird
 
 [relations]
-gcc: gcc (>= 4:4.0)
 gcc-3.3: gcc-3.3
+gcc-4.0: gcc-4.0
 initramfs-fallback: linux-initramfs-tool
 initramfs-tools: initramfs-tools (>= 0.53)
 yaird: yaird (>= 0.0.12-8)

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 Apr 28 19:34:43 2006
@@ -34,6 +34,10 @@
         packages['source'] = self.process_package(source[0], self.vars)
 
     def do_main(self, packages, makefile):
+        config_entry = self.config['base',]
+        vars = self.vars.copy()
+        vars.update(config_entry)
+
         makeflags = {
             'MAJOR': self.version['major'],
             'VERSION': self.version['version'],
@@ -43,8 +47,6 @@
             'ABINAME': self.abiname,
         }
 
-        vars = self.vars.copy()
-
         self.do_main_setup(vars, makeflags)
         self.do_main_packages(packages)
         self.do_main_makefile(makefile, makeflags)