diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index ab0471ec9..1eeda4587 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -38,10 +38,6 @@ class Gencontrol(Base): }, 'relations': { }, - 'xen': { - 'flavours': config.SchemaItemList(), - 'versions': config.SchemaItemList(), - }, 'packages': { 'docs': config.SchemaItemBoolean(), 'headers-all': config.SchemaItemBoolean(), @@ -392,15 +388,6 @@ class Gencontrol(Base): image = self.templates[build_signed and "control.image-unsigned" or "control.image"] - config_entry_xen = self.config.merge('xen', arch, featureset, flavour) - if config_entry_xen: - 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) image_main = self.process_real_image(image[0], image_fields, vars) diff --git a/debian/changelog b/debian/changelog index b5f96acab..d315ff6cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ linux (4.9~rc7-1~exp2) UNRELEASED; urgency=medium * radeon: Update package name in error message for missing firmware + * [amd64] Remove xen-linux-system- package -- Ben Hutchings Sat, 03 Dec 2016 02:54:32 +0000 diff --git a/debian/config/amd64/none/defines b/debian/config/amd64/none/defines index 1a93252b7..13ae9eb2c 100644 --- a/debian/config/amd64/none/defines +++ b/debian/config/amd64/none/defines @@ -4,7 +4,3 @@ flavours: [amd64_description] parts: xen - -[amd64_xen] -flavours: - amd64 diff --git a/debian/templates/control.xen-linux-system.in b/debian/templates/control.xen-linux-system.in deleted file mode 100644 index 44716211d..000000000 --- a/debian/templates/control.xen-linux-system.in +++ /dev/null @@ -1,9 +0,0 @@ -Package: xen-linux-system-@abiname@@localversion@ -Build-Profiles: -Section: metapackages -Depends: linux-image-@abiname@@localversion@ (>= ${binary:Version}), - linux-image-@abiname@@localversion@ (<< ${binary:Version}+deb), - ${misc:Depends} -Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package) - This package depends on the binary Linux image and hypervisors. -