[kernel] r15384 - in dists/sid/linux-2.6/debian: bin config config/amd64 config/featureset-openvz config/i386

[Maximilian Attems]

Author: maks
Date: Tue Mar 16 00:11:09 2010
New Revision: 15384

Log:
readd openvz in small dose

still disabled and without patch,
but makes it easier for me to test against latest sid.

Added:
   dists/sid/linux-2.6/debian/config/featureset-openvz/config
   dists/sid/linux-2.6/debian/config/featureset-openvz/defines
Modified:
   dists/sid/linux-2.6/debian/bin/test-patches
   dists/sid/linux-2.6/debian/config/amd64/defines
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/config/i386/defines

Modified: dists/sid/linux-2.6/debian/bin/test-patches
==============================================================================
--- dists/sid/linux-2.6/debian/bin/test-patches	Mon Mar 15 18:01:34 2010	(r15383)
+++ dists/sid/linux-2.6/debian/bin/test-patches	Tue Mar 16 00:11:09 2010	(r15384)
@@ -8,7 +8,7 @@
 kernelabi="$(uname -r)"
 ff="${kernelabi#+([^-])-@(trunk|+([0-9]))-}"
 if [ "x$ff" != "x$kernelabi" ]; then
-    flavour="${ff#@(vserver|xen)-}"
+    flavour="${ff#@(openvz|vserver|xen)-}"
     if [ "x$flavour" != "x$ff" ]; then
 	featureset="${ff%-$flavour}"
     else

Modified: dists/sid/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/defines	Mon Mar 15 18:01:34 2010	(r15383)
+++ dists/sid/linux-2.6/debian/config/amd64/defines	Tue Mar 16 00:11:09 2010	(r15384)
@@ -1,5 +1,6 @@
 [base]
 featuresets:
+ openvz
  vserver
  xen
 flavours:

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Mon Mar 15 18:01:34 2010	(r15383)
+++ dists/sid/linux-2.6/debian/config/defines	Tue Mar 16 00:11:09 2010	(r15384)
@@ -19,9 +19,13 @@
 compiler: gcc-4.3
 featuresets:
  none
+ openvz
  vserver
  xen
 
+[featureset-openvz_base]
+enabled: false
+
 [featureset-vserver_base]
 enabled: true
 

Added: dists/sid/linux-2.6/debian/config/featureset-openvz/config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/config/featureset-openvz/config	Tue Mar 16 00:11:09 2010	(r15384)
@@ -0,0 +1,25 @@
+CONFIG_VZ_FAIRSCHED=y
+CONFIG_VE=y
+CONFIG_VE_CALLS=m
+CONFIG_VE_NETDEV=m
+CONFIG_VE_ETHDEV=m
+CONFIG_VZ_DEV=m
+CONFIG_VE_IPTABLES=y
+CONFIG_VZ_WDOG=m
+CONFIG_VZ_CHECKPOINT=m
+CONFIG_SIM_FS=m
+CONFIG_VZ_QUOTA=m
+# CONFIG_VZ_QUOTA_UNLOAD is not set
+CONFIG_VZ_QUOTA_UGID=y
+CONFIG_SYSRQ_DEBUG=y
+CONFIG_BEANCOUNTERS=y
+CONFIG_BC_RSS_ACCOUNTING=y
+CONFIG_BC_IO_ACCOUNTING=y
+CONFIG_BC_IO_SCHED=y
+CONFIG_BC_SWAP_ACCOUNTING=y
+CONFIG_BC_PROC=y
+# CONFIG_BC_DEBUG is not set
+
+# buggy
+# CONFIG_NF_CONNTRACK_IPV6 is not set
+

Added: dists/sid/linux-2.6/debian/config/featureset-openvz/defines
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/config/featureset-openvz/defines	Tue Mar 16 00:11:09 2010	(r15384)
@@ -0,0 +1,7 @@
+[description]
+part-long-openvz: This kernel includes support for OpenVZ container-based virtualization.
+part-short-openvz: OpenVZ support
+parts: openvz
+
+[image]
+depends: vzctl

Modified: dists/sid/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/defines	Mon Mar 15 18:01:34 2010	(r15383)
+++ dists/sid/linux-2.6/debian/config/i386/defines	Tue Mar 16 00:11:09 2010	(r15384)
@@ -1,5 +1,6 @@
 [base]
 featuresets:
+ openvz
  vserver
  xen
 flavours: