debian/arch/i386/xen/defines, debian/arch/i386/xen-vserver/defines

- Drop k7 flavour.
- Build only pae version.
- Use correct hypervisor.

svn path=/dists/sid/linux-2.6/; revision=8016

debian/arch/i386/xen-vserver/defines

@@ -13,8 +13,12 @@ suggests: grub (>= 0.97-16)
 type: plain-xen
 
 [xen]
-flavour: i386
+flavour: i386-pae
+
+[686]
+class: i686
+longclass: i686 and compatible
 
 [686_image]
-configs: i386/config.686
+configs: i386/config.686-bigmem
 

debian/arch/i386/xen/defines

@@ -1,21 +1,23 @@
 [base]
 flavours:
  686
- k7
 
 [image]
-configs: i386/xen/config _xen/config
+configs:
+ i386/xen/config
+ _xen/config
 initramfs-generators: initramfs-tools
 recommends: libc6-xen
 suggests: grub (>= 0.97-16)
 type: plain-xen
 
 [xen]
-flavour: i386
+flavour: i386-pae
+
+[686]
+class: i686
+longclass: i686 and compatible
 
 [686_image]
-configs: i386/config.686
-
-[k7_image]
-configs: i386/config.k7
+configs: i386/config.686-bigmem