[kernel] r7848 - dists/sid/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Sun Nov 19 17:53:08 2006
New Revision: 7848

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Support image template per type.


Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Nov 19 17:53:08 2006
@@ -97,9 +97,6 @@
                 makeflags[i[1]] = vars[i[0]]
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
-        image_type_modulesextra = self.templates["control.image.type-modulesextra"]
-        image_type_modulesinline = self.templates["control.image.type-modulesinline"]
-        image_type_standalone = self.templates["control.image.type-standalone"]
         headers = self.templates["control.headers"]
 
         config_entry_base = self.config.merge('base', arch, subarch, flavour)
@@ -127,9 +124,11 @@
         packages_own = []
 
         if vars['type'] == 'plain-s390-tape':
-            image = image_type_standalone
+            image = self.templates["control.image.type-standalone"]
+            build_modules = False
         elif vars['type'] == 'plain-xen':
-            image = image_type_modulesextra
+            image = self.templates["control.image.type-modulesextra"]
+            build_modules = True
             config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
             p = self.process_packages(self.templates['control.xen-linux-system'], vars)
             l = package_relation_group()
@@ -139,7 +138,9 @@
             p[0]['Depends'].append(l)
             packages_dummy.extend(p)
         else:
-            image = image_type_modulesinline
+            build_modules = True
+            image = self.templates["control.image.type-%s" % vars['type']]
+            #image = self.templates["control.image.type-modulesinline"]
 
         if not vars.has_key('desc'):
             vars['desc'] = None
@@ -147,7 +148,7 @@
         packages_own.append(self.process_real_image(image[0], {'depends': image_depends}, config_entry_relations, vars))
         packages_own.extend(self.process_packages(image[1:], vars))
 
-        if image in (image_type_modulesextra, image_type_modulesinline):
+        if build_modules:
             makeflags['MODULES'] = True
             package_headers = self.process_package(headers[0], vars)
             package_headers['Depends'].extend(relations_compiler)