[kernel] r7474 - in dists/trunk/linux-2.6/debian/arch: _vserver amd64/vserver i386/vserver powerpc/vserver

[Bastian Blank]

Author: waldi
Date: Thu Sep 21 17:54:14 2006
New Revision: 7474

Added:
   dists/trunk/linux-2.6/debian/arch/_vserver/
   dists/trunk/linux-2.6/debian/arch/_vserver/config
Removed:
   dists/trunk/linux-2.6/debian/arch/amd64/vserver/config
   dists/trunk/linux-2.6/debian/arch/amd64/vserver/config.amd64
   dists/trunk/linux-2.6/debian/arch/i386/vserver/config
   dists/trunk/linux-2.6/debian/arch/i386/vserver/config.686
   dists/trunk/linux-2.6/debian/arch/i386/vserver/config.k7
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64
Modified:
   dists/trunk/linux-2.6/debian/arch/amd64/vserver/defines
   dists/trunk/linux-2.6/debian/arch/i386/vserver/defines
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/defines

Log:
Don't longer copy kernel configs for vserver images.

* debian/arch/amd64/vserver/defines, debian/arch/i386/vserver/defines,
  debian/arch/powerpc/vserver/defines: Reuse configs.
* debian/arch/amd64/vserver/config, debian/arch/amd64/vserver/config.amd64
  debian/arch/i386/vserver/config, debian/arch/i386/vserver/config.686,
  debian/arch/i386/vserver/config.k7, debian/arch/powerpc/vserver/config,
  debian/arch/powerpc/vserver/config.powerpc,
  debian/arch/powerpc/vserver/config.powerpc64: Remove.
* debian/arch/_vserver: New directory.
* debian/arch/_vserver/config: Add.


Added: dists/trunk/linux-2.6/debian/arch/_vserver/config
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/arch/_vserver/config	Thu Sep 21 17:54:14 2006
@@ -0,0 +1,25 @@
+CONFIG_VSERVER=y
+CONFIG_VSERVER_SECURITY=y
+CONFIG_VSERVER_LEGACYNET=y
+CONFIG_VSERVER_LEGACY=y
+# CONFIG_VSERVER_LEGACY_VERSION is not set
+CONFIG_VSERVER_DYNAMIC_IDS=y
+# CONFIG_VSERVER_NGNET is not set
+CONFIG_VSERVER_COWBL=y
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
+# CONFIG_INOXID_NONE is not set
+# CONFIG_INOXID_UID16 is not set
+# CONFIG_INOXID_GID16 is not set
+CONFIG_INOXID_UGID24=y
+# CONFIG_INOXID_INTERN is not set
+# CONFIG_INOXID_RUNTIME is not set
+# CONFIG_XID_TAG_NFSD is not set
+# CONFIG_XID_PROPAGATE is not set
+# CONFIG_VSERVER_DEBUG is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_25G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_15G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_BLK_DEV_VROOT=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/vserver/defines	Thu Sep 21 17:54:14 2006
@@ -3,5 +3,9 @@
  amd64
 
 [image]
+configs: _vserver/config
 recommends: util-vserver
 
+[amd64_image]
+configs: amd64/config.amd64
+

Modified: dists/trunk/linux-2.6/debian/arch/i386/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/vserver/defines	Thu Sep 21 17:54:14 2006
@@ -4,5 +4,12 @@
  k7
 
 [image]
+configs: _vserver/config
 recommends: util-vserver, libc6-i686
 
+[686_image]
+configs: i386/config.686
+
+[k7_image]
+configs: i386/config.k7
+

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/defines	Thu Sep 21 17:54:14 2006
@@ -4,11 +4,12 @@
  powerpc64
 
 [image]
+configs: _vserver/config
 recommends: util-vserver
 
-[powerpc]
-depends: mkvmlinuz (>= 20)
+[powerpc_image]
+configs: powerpc/config.powerpc-smp
 
-[powerpc64]
-kpkg-subarch: powerpc64
+[powerpc64_image]
+configs: powerpc/config.powerpc64