[kernel] r18710 - in dists/sid/linux-2.6/debian: . config/amd64 config/amd64/none config/i386 config/i386/none

[Bastian Blank]

Author: waldi
Date: Mon Feb 20 12:53:32 2012
New Revision: 18710

Log:
Don't advertise Xen in rt images.

* debian/changelog: Update.
* debian/config/amd64/none/defines, debian/config/i386/none/defines:
  Move xen description and definitions from architecture specific config.
* debian/config/i386/defines, debian/config/amd64/defines:
  Remove all xen specific stuff.

Added:
   dists/sid/linux-2.6/debian/config/amd64/none/
   dists/sid/linux-2.6/debian/config/amd64/none/defines
   dists/sid/linux-2.6/debian/config/i386/none/defines
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/amd64/defines
   dists/sid/linux-2.6/debian/config/i386/defines

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Feb 20 01:49:35 2012	(r18709)
+++ dists/sid/linux-2.6/debian/changelog	Mon Feb 20 12:53:32 2012	(r18710)
@@ -20,6 +20,9 @@
       BLK_DEV_HT6560B, BLK_DEV_QD65XX, BLK_DEV_UMC8672
   * fs: Enable EFI_PARTITION in all configurations (Closes: #660582)
 
+  [ Bastian Blank ]
+  * Don't advertise Xen support for rt images. (closes: #659988)
+
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 17 Feb 2012 03:29:39 +0000
 
 linux-2.6 (3.2.6-1) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/defines	Mon Feb 20 01:49:35 2012	(r18709)
+++ dists/sid/linux-2.6/debian/config/amd64/defines	Mon Feb 20 12:53:32 2012	(r18710)
@@ -1,8 +1,7 @@
 [base]
 featuresets:
+ none
  rt
-flavours:
- amd64
 kernel-arch: x86
 
 [build]
@@ -16,13 +15,7 @@
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
-parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
-
-[amd64_xen]
-dom0-support: true
-flavours:
- amd64

Added: dists/sid/linux-2.6/debian/config/amd64/none/defines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/config/amd64/none/defines	Mon Feb 20 12:53:32 2012	(r18710)
@@ -0,0 +1,11 @@
+[base]
+flavours:
+ amd64
+
+[amd64_description]
+parts: xen
+
+[amd64_xen]
+dom0-support: true
+flavours:
+ amd64

Modified: dists/sid/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/defines	Mon Feb 20 01:49:35 2012	(r18709)
+++ dists/sid/linux-2.6/debian/config/i386/defines	Mon Feb 20 12:53:32 2012	(r18710)
@@ -1,10 +1,7 @@
 [base]
 featuresets:
+ none
  rt
-flavours:
- 486
- 686-pae
- amd64
 kernel-arch: x86
 
 [description]
@@ -33,30 +30,18 @@
 [686-pae_description]
 hardware: modern PCs
 hardware-long: PCs with one or more processors supporting PAE
-parts: pae xen
+parts: pae
 
 [686-pae_image]
 configs:
  kernelarch-x86/config-arch-32
 recommends: libc6-i686
 
-[686-pae_xen]
-dom0-support: true
-flavours:
- i386
- amd64
-
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
-parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
 recommends: libc6-i686
-
-[amd64_xen]
-dom0-support: true
-flavours:
- amd64

Added: dists/sid/linux-2.6/debian/config/i386/none/defines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/config/i386/none/defines	Mon Feb 20 12:53:32 2012	(r18710)
@@ -0,0 +1,22 @@
+[base]
+flavours:
+ 486
+ 686-pae
+ amd64
+
+[686-pae_description]
+parts: xen
+
+[686-pae_xen]
+dom0-support: true
+flavours:
+ i386
+ amd64
+
+[amd64_description]
+parts: xen
+
+[amd64_xen]
+dom0-support: true
+flavours:
+ amd64