debian/bin/gencontrol.py, debian/config/amd64/defines,

debian/config/i386/defines: Remove dom0-support option.

svn path=/dists/trunk/linux/; revision=19542

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)
 

debian/config/amd64/defines

@@ -23,6 +23,5 @@ configs:
  kernelarch-x86/config-arch-64
 
 [amd64_xen]
-dom0-support: true
 flavours:
  amd64

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