* debian/bin/gencontrol.py
- Disable old xen support. - Support xen dom0 for all images. * debian/templates/control.xen-linux-system.in: Fix description. svn path=/dists/sid/linux-2.6/; revision=15299
This commit is contained in:
parent
976c48db68
commit
f5d1c9b954
|
@ -156,6 +156,7 @@ class Gencontrol(Base):
|
||||||
image = self.templates["control.image.type-standalone"]
|
image = self.templates["control.image.type-standalone"]
|
||||||
build_modules = False
|
build_modules = False
|
||||||
elif config_entry_image['type'] == 'plain-xen':
|
elif config_entry_image['type'] == 'plain-xen':
|
||||||
|
raise RuntimeError
|
||||||
image = self.templates["control.image.type-modulesextra"]
|
image = self.templates["control.image.type-modulesextra"]
|
||||||
build_modules = True
|
build_modules = True
|
||||||
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
|
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
|
||||||
|
@ -175,6 +176,15 @@ class Gencontrol(Base):
|
||||||
image = self.templates["control.image.type-%s" % config_entry_image['type']]
|
image = self.templates["control.image.type-%s" % config_entry_image['type']]
|
||||||
#image = self.templates["control.image.type-modulesinline"]
|
#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)
|
vars.setdefault('desc', None)
|
||||||
|
|
||||||
packages_own.append(self.process_real_image(image[0], image_fields, vars))
|
packages_own.append(self.process_real_image(image[0], image_fields, vars))
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
|
Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
|
||||||
Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
|
Depends: linux-image-@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.
|
This package depends on the binary Linux image and hypervisors.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue