[kernel] r6014 - in people/waldi/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 12:30:30 2006
New Revision: 6014

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
* debian/bin/gencontrol.py: Add base image config entry.
* debian/lib/python/debian_linux/gencontrol.py:
  Remove another usage of the image config sections.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Thu Mar  2 12:30:30 2006
@@ -5,6 +5,9 @@
 from debian_linux.debian import *
 
 class gencontrol(debian_linux.gencontrol.gencontrol):
+    def do_main_setup(self, vars, makeflags):
+        vars.update(self.config['image',])
+
     def do_main_packages(self, packages):
         vars = self.changelog_vars
 

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Mar  2 12:30:30 2006
@@ -43,15 +43,18 @@
             'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
         }
 
+        vars = self.changelog_vars.copy()
+
+        self.do_main_setup(vars, makeflags)
         self.do_main_packages(packages)
         self.do_main_makefile(makefile, makeflags)
 
-        vars = self.changelog_vars.copy()
-        vars.update(self.config['image',])
-
         for arch in iter(self.config['base',]['arches']):
             self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy())
 
+    def do_main_setup(self, vars, makeflags):
+        pass
+
     def do_main_makefile(self, makefile, makeflags):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])