[kernel] r9237 - in dists/trunk/linux-2.6/debian/config: _vserver _xen alpha/vserver amd64/vserver amd64/xen amd64/xen-vserver featureset-vserver featureset-xen i386/vserver i386/xen i386/xen-vserver ia64/vserver powerpc/vserver s390/vserver sparc/vserver

[Bastian Blank]

Author: waldi
Date: Tue Jul 31 09:42:40 2007
New Revision: 9237

Log:
* debian/config/alpha/vserver/defines, debian/config/amd64/vserver/defines,
  debian/config/amd64/xen/defines, debian/config/amd64/xen-vserver/defines,
  debian/config/i386/vserver/defines, debian/config/i386/xen/defines,
  debian/config/i386/xen-vserver/defines, debian/config/ia64/vserver/defines,
  debian/config/powerpc/vserver/defines, debian/config/s390/vserver/defines,
  debian/config/sparc/vserver/defines:
  Drop direct reference of featureset configs.
* debian/config/featureset-vserver/config: 
  Move from debian/config/_vserver/config.
* debian/config/featureset-xen/config: Move from debian/config/_xen/config.
* debian/config/_vserver, debian/config/_xen: Remove.


Added:
   dists/trunk/linux-2.6/debian/config/featureset-vserver/config
      - copied unchanged from r9187, /dists/trunk/linux-2.6/debian/config/_vserver/config
   dists/trunk/linux-2.6/debian/config/featureset-xen/config
      - copied unchanged from r9187, /dists/trunk/linux-2.6/debian/config/_xen/config
Removed:
   dists/trunk/linux-2.6/debian/config/_vserver/
   dists/trunk/linux-2.6/debian/config/_xen/
Modified:
   dists/trunk/linux-2.6/debian/config/alpha/vserver/defines
   dists/trunk/linux-2.6/debian/config/amd64/vserver/defines
   dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines
   dists/trunk/linux-2.6/debian/config/amd64/xen/defines
   dists/trunk/linux-2.6/debian/config/i386/vserver/defines
   dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines
   dists/trunk/linux-2.6/debian/config/i386/xen/defines
   dists/trunk/linux-2.6/debian/config/ia64/vserver/defines
   dists/trunk/linux-2.6/debian/config/powerpc/vserver/defines
   dists/trunk/linux-2.6/debian/config/s390/vserver/defines
   dists/trunk/linux-2.6/debian/config/sparc/vserver/defines

Modified: dists/trunk/linux-2.6/debian/config/alpha/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/alpha/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -2,7 +2,6 @@
 flavours: alpha
 
 [image]
-configs: _vserver/config
 recommends: util-vserver
 
 [alpha_base]

Modified: dists/trunk/linux-2.6/debian/config/amd64/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -3,9 +3,5 @@
  amd64
 
 [image]
-configs: _vserver/config
 recommends: util-vserver
 
-[amd64_image]
-configs: amd64/config.amd64
-

Modified: dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines	Tue Jul 31 09:42:40 2007
@@ -3,10 +3,6 @@
  amd64
 
 [image]
-configs:
- _vserver/config
- amd64/xen/config
- _xen/config
 initramfs-generators: initramfs-tools 
 suggests: grub (>= 0.97-16)
 type: plain-xen

Modified: dists/trunk/linux-2.6/debian/config/amd64/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/xen/defines	Tue Jul 31 09:42:40 2007
@@ -3,7 +3,6 @@
  amd64
 
 [image]
-configs: amd64/xen/config _xen/config
 initramfs-generators: initramfs-tools 
 suggests: grub (>= 0.97-16)
 type: plain-xen

Modified: dists/trunk/linux-2.6/debian/config/i386/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -5,7 +5,6 @@
 kernel-header-dirs: i386
 
 [image]
-configs: _vserver/config
 recommends: util-vserver, libc6-i686
 
 [686_image]

Modified: dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines	Tue Jul 31 09:42:40 2007
@@ -4,10 +4,6 @@
 kernel-header-dirs: i386
 
 [image]
-configs:
- _vserver/config
- i386/xen/config
- _xen/config
 initramfs-generators: initramfs-tools
 recommends: libc6-xen
 suggests: grub (>= 0.97-16)

Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/defines	Tue Jul 31 09:42:40 2007
@@ -4,9 +4,6 @@
 kernel-header-dirs: i386
 
 [image]
-configs:
- i386/xen/config
- _xen/config
 initramfs-generators: initramfs-tools
 recommends: libc6-xen
 suggests: grub (>= 0.97-16)

Modified: dists/trunk/linux-2.6/debian/config/ia64/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/ia64/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -5,7 +5,6 @@
 kernel-header-dirs: ia64
 
 [image]
-configs: _vserver/config
 recommends: util-vserver
 
 [itanium_image]

Modified: dists/trunk/linux-2.6/debian/config/powerpc/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -4,7 +4,6 @@
  powerpc64
 
 [image]
-configs: _vserver/config
 recommends: util-vserver
 
 [powerpc_image]

Modified: dists/trunk/linux-2.6/debian/config/s390/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/s390/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -1,9 +1,6 @@
 [base]
 flavours: s390x
 
-[image]
-configs: _vserver/config
-
 [s390x_image]
 configs: s390/config.s390x
 

Modified: dists/trunk/linux-2.6/debian/config/sparc/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/sparc/vserver/defines	Tue Jul 31 09:42:40 2007
@@ -3,7 +3,6 @@
  sparc64
 
 [image]
-configs: _vserver/config
 recommends: util-vserver, libc6-sparc64
 
 [sparc64_image]