[kernel] r12332 - in people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update: amd64 amd64/xen-vserver i386 i386/xen-vserver

[Bastian Blank]

Author: waldi
Date: Fri Oct 17 14:47:07 2008
New Revision: 12332

Log:
debian/config-update: Fix xen flavours definitions.


Modified:
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/defines
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/xen-vserver/defines
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/defines
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/xen-vserver/defines

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/defines
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/defines	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/defines	Fri Oct 17 14:47:07 2008
@@ -4,8 +4,5 @@
  xen-vserver
 kernel-arch: x86_64
 
-[xen_base]
-enabled: true
-
-[xen-vserver_base]
-enabled: true
+[xen]
+flavours: amd64

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/xen-vserver/defines
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/xen-vserver/defines	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/amd64/xen-vserver/defines	Fri Oct 17 14:47:07 2008
@@ -8,5 +8,5 @@
 type: plain-xen
 
 [xen]
-flavour: amd64
-
+flavours:
+ amd64

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/defines
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/defines	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/defines	Fri Oct 17 14:47:07 2008
@@ -3,3 +3,6 @@
  xen
  xen-vserver
 kernel-arch: i386
+
+[xen]
+flavour: i386

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/xen-vserver/defines
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/xen-vserver/defines	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/config-update/i386/xen-vserver/defines	Fri Oct 17 14:47:07 2008
@@ -9,10 +9,7 @@
 suggests: grub (>= 0.97-16)
 type: plain-xen
 
-[xen]
-flavour: i386
-
-[686]
+[686_base]
 class: i686
 longclass: i686 and compatible
 
@@ -20,3 +17,8 @@
 configs:
  i386/config.686-bigmem
  i386/xen/config
+
+[xen]
+flavours:
+ i386
+ amd64