diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-12-04 16:21:14 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-12-04 16:21:18 +0000 |
| commit | aa271372988b16d11b51f6f83802617eee79c798 (patch) | |
| tree | 2a0b1f791e55423393a82f864497a6247ee0c819 | |
| parent | 7e80c27706b095d4da337b90b84bffaf18ad9148 (diff) | |
[amd64] Remove xen-linux-system-<version> package
Since there are no amd64 kernel configurations without Xen dom0
support, these meta-packages don't provide much value any more.
| -rwxr-xr-x | debian/bin/gencontrol.py | 13 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/config/amd64/none/defines | 4 | ||||
| -rw-r--r-- | debian/templates/control.xen-linux-system.in | 9 |
4 files changed, 1 insertions, 26 deletions
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-<version> package -- Ben Hutchings <ben@decadent.org.uk> 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: <!stage1> -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. - |