diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 6c8c38214..290dbecb8 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -34,7 +34,6 @@ class Gencontrol(Base): 'relations': { }, 'xen': { - 'dom0-support': config.SchemaItemBoolean(), 'flavours': config.SchemaItemList(), 'versions': config.SchemaItemList(), } @@ -273,13 +272,12 @@ class Gencontrol(Base): 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) diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 7205d3312..6b8fd4ab8 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -23,6 +23,5 @@ configs: kernelarch-x86/config-arch-64 [amd64_xen] -dom0-support: true flavours: amd64 diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 931e4c9ae..30802b4a6 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -43,7 +43,6 @@ configs: recommends: libc6-i686 [686-pae_xen] -dom0-support: true flavours: i386 amd64 @@ -59,6 +58,5 @@ configs: recommends: libc6-i686 [amd64_xen] -dom0-support: true flavours: amd64