[kernel] r19542 - in dists/trunk/linux/debian: bin config/amd64 config/i386
Bastian Blank
waldi at alioth.debian.org
Mon Nov 26 22:15:07 UTC 2012
Author: waldi
Date: Mon Nov 26 22:15:06 2012
New Revision: 19542
Log:
debian/bin/gencontrol.py, debian/config/amd64/defines,
debian/config/i386/defines: Remove dom0-support option.
Modified:
dists/trunk/linux/debian/bin/gencontrol.py
dists/trunk/linux/debian/config/amd64/defines
dists/trunk/linux/debian/config/i386/defines
Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py Mon Nov 26 22:13:37 2012 (r19541)
+++ dists/trunk/linux/debian/bin/gencontrol.py Mon Nov 26 22:15:06 2012 (r19542)
@@ -34,7 +34,6 @@
'relations': {
},
'xen': {
- 'dom0-support': config.SchemaItemBoolean(),
'flavours': config.SchemaItemList(),
'versions': config.SchemaItemList(),
}
@@ -273,13 +272,12 @@
image = self.templates["control.image.type-%s" % config_entry_image['type']]
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
- if config_entry_xen.get('dom0-support', False):
- p = self.process_packages(self.templates['control.xen-linux-system'], vars)
- l = PackageRelationGroup()
- for xen_flavour in config_entry_xen['flavours']:
- l.append("xen-system-%s" % xen_flavour)
- p[0]['Depends'].append(l)
- packages_dummy.extend(p)
+ p = self.process_packages(self.templates['control.xen-linux-system'], vars)
+ l = PackageRelationGroup()
+ for xen_flavour in config_entry_xen['flavours']:
+ l.append("xen-system-%s" % xen_flavour)
+ p[0]['Depends'].append(l)
+ packages_dummy.extend(p)
vars.setdefault('desc', None)
Modified: dists/trunk/linux/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux/debian/config/amd64/defines Mon Nov 26 22:13:37 2012 (r19541)
+++ dists/trunk/linux/debian/config/amd64/defines Mon Nov 26 22:15:06 2012 (r19542)
@@ -23,6 +23,5 @@
kernelarch-x86/config-arch-64
[amd64_xen]
-dom0-support: true
flavours:
amd64
Modified: dists/trunk/linux/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux/debian/config/i386/defines Mon Nov 26 22:13:37 2012 (r19541)
+++ dists/trunk/linux/debian/config/i386/defines Mon Nov 26 22:15:06 2012 (r19542)
@@ -43,7 +43,6 @@
recommends: libc6-i686
[686-pae_xen]
-dom0-support: true
flavours:
i386
amd64
@@ -59,6 +58,5 @@
recommends: libc6-i686
[amd64_xen]
-dom0-support: true
flavours:
amd64
More information about the Kernel-svn-changes
mailing list