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.

svn path=/dists/sid/linux-2.6/; revision=18710
This commit is contained in:
Bastian Blank 2012-02-20 12:53:32 +00:00
parent 7fadbee238
commit a5f8f84f93
5 changed files with 39 additions and 25 deletions

3
debian/changelog vendored
View File

@ -20,6 +20,9 @@ linux-2.6 (3.2.6-2) UNRELEASED; urgency=low
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@decadent.org.uk> Fri, 17 Feb 2012 03:29:39 +0000
linux-2.6 (3.2.6-1) unstable; urgency=low

View File

@ -1,8 +1,7 @@
[base]
featuresets:
none
rt
flavours:
amd64
kernel-arch: x86
[build]
@ -16,13 +15,7 @@ configs:
[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

11
debian/config/amd64/none/defines vendored Normal file
View File

@ -0,0 +1,11 @@
[base]
flavours:
amd64
[amd64_description]
parts: xen
[amd64_xen]
dom0-support: true
flavours:
amd64

View File

@ -1,10 +1,7 @@
[base]
featuresets:
none
rt
flavours:
486
686-pae
amd64
kernel-arch: x86
[description]
@ -33,30 +30,18 @@ debug-info: true
[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

22
debian/config/i386/none/defines vendored Normal file
View File

@ -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