[kernel] r15299 - in dists/sid/linux-2.6/debian: bin templates
Bastian Blank
waldi at alioth.debian.org
Mon Mar 1 13:04:14 UTC 2010
Author: waldi
Date: Mon Mar 1 13:04:08 2010
New Revision: 15299
Log:
* debian/bin/gencontrol.py
- Disable old xen support.
- Support xen dom0 for all images.
* debian/templates/control.xen-linux-system.in: Fix description.
Modified:
dists/sid/linux-2.6/debian/bin/gencontrol.py
dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in
Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py Mon Mar 1 13:02:59 2010 (r15298)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py Mon Mar 1 13:04:08 2010 (r15299)
@@ -156,6 +156,7 @@
image = self.templates["control.image.type-standalone"]
build_modules = False
elif config_entry_image['type'] == 'plain-xen':
+ raise RuntimeError
image = self.templates["control.image.type-modulesextra"]
build_modules = True
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
@@ -175,6 +176,15 @@
image = self.templates["control.image.type-%s" % config_entry_image['type']]
#image = self.templates["control.image.type-modulesinline"]
+ 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-hypervisor-%s" % xen_flavour)
+ p[0]['Depends'].append(l)
+ packages_dummy.extend(p)
+
vars.setdefault('desc', None)
packages_own.append(self.process_real_image(image[0], image_fields, vars))
Modified: dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in Mon Mar 1 13:02:59 2010 (r15298)
+++ dists/sid/linux-2.6/debian/templates/control.xen-linux-system.in Mon Mar 1 13:04:08 2010 (r15299)
@@ -1,5 +1,5 @@
Package: xen-linux-system- at upstreamversion@@abiname@@localversion@
Depends: linux-image- at upstreamversion@@abiname@@localversion@ (= ${binary:Version})
-Description: XEN system with Linux @upstreamversion@ image on @class@
+Description: Xen system with Linux @upstreamversion@ on @class@
This package depends on the binary Linux image and hypervisors.
More information about the Kernel-svn-changes
mailing list