[kernel] r7387 - in dists/sid/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Mon Sep 11 18:47:20 2006
New Revision: 7387

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py

Log:
* debian/bin/gencontrol.py: Generate xen hypervisor dependencies.
* debian/lib/python/debian_linux/config.py: Extend schema.


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	Mon Sep 11 18:47:20 2006
@@ -131,9 +131,12 @@
         elif vars['type'] == 'plain-xen':
             image = image_type_modulesextra
             config_entry_xen = self.config.merge('xen', arch, subarch, flavour)
-            for i, j in config_entry_xen.iteritems():
-                vars['xen-%s' % i] = j
-            packages_dummy.extend(self.process_packages(self.templates['control.xen-linux-system'], vars))
+            p = self.process_packages(self.templates['control.xen-linux-system'], vars)
+            l = package_relation_group()
+            for version in config_entry_xen['versions']:
+                l.append("xen-hypervisor-%s-%s" % (version, config_entry_xen['flavour']))
+            p[0]['Depends'].append(l)
+            packages_dummy.extend(p)
         else:
             image = image_type_modulesinline
 

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	Mon Sep 11 18:47:20 2006
@@ -70,6 +70,7 @@
         'initramfs-generators': schema_item_list(),
         'modules': schema_item_boolean(),
         'subarches': schema_item_list(),
+        'versions': schema_item_list(),
     }
 
     def __init__(self, dirs = []):