[kernel] r12258 - in dists/sid/linux-2.6/debian: bin config/amd64/xen config/i386/xen lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sat Sep 27 11:41:48 2008
New Revision: 12258

Log:
Mention support of amd64 hypervisor in i386 Xen image.

* debian/bin/gencontrol.py: Support more than one Xen flavour.
* debian/config/amd64/xen/defines: Update.
* debian/config/i386/xen/defines: Add amd64 to Xen flavours.
* debian/lib/python/debian_linux/config.py: Add new field.


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

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	Sat Sep 27 11:41:48 2008
@@ -164,9 +164,12 @@
             if config_entry_xen.get('dom0-support', True):
                 p = self.process_packages(self.templates['control.xen-linux-system'], vars)
                 l = PackageRelationGroup()
-                for version in config_entry_xen['versions']:
-                    l.append("xen-hypervisor-%s-%s" % (version, config_entry_xen['flavour']))
-                makeflags['XEN_VERSIONS'] = ' '.join(['%s-%s' % (i, config_entry_xen['flavour']) for i in config_entry_xen['versions']])
+                xen_versions = []
+                for flavour in config_entry_xen['flavours']:
+                    for version in config_entry_xen['versions']:
+                        l.append("xen-hypervisor-%s-%s" % (version, flavour))
+                        xen_versions.append('%s-%s' % (version, flavour))
+                makeflags['XEN_VERSIONS'] = ' '.join(xen_versions)
                 p[0]['Depends'].append(l)
                 packages_dummy.extend(p)
         else:

Modified: dists/sid/linux-2.6/debian/config/amd64/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/config/amd64/xen/defines	Sat Sep 27 11:41:48 2008
@@ -8,5 +8,5 @@
 type: plain-xen
 
 [xen]
-flavour: amd64
+flavours: amd64
 

Modified: dists/sid/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/xen/defines	(original)
+++ dists/sid/linux-2.6/debian/config/i386/xen/defines	Sat Sep 27 11:41:48 2008
@@ -11,7 +11,9 @@
 type: plain-xen
 
 [xen]
-flavour: i386
+flavours:
+ i386
+ amd64
 
 [686_base]
 class: i686

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	Sat Sep 27 11:41:48 2008
@@ -93,6 +93,7 @@
         },
         'xen': {
             'dom0-support': SchemaItemBoolean(),
+            'flavours': SchemaItemList(),
             'versions': SchemaItemList(),
         }
     }