[kernel] r14991 - in dists/trunk/linux-2.6/debian: bin config config/amd64 config/featureset-openvz config/i386 patches/series

[Maximilian Attems]

Author: maks
Date: Sun Jan 24 12:08:42 2010
New Revision: 14991

Log:
cleanup trunk from openvz references

no patch forcoming, no schedule for a patch.
thus no openvz bannana for squeeze.

Deleted:
   dists/trunk/linux-2.6/debian/config/featureset-openvz/config
   dists/trunk/linux-2.6/debian/config/featureset-openvz/defines
Modified:
   dists/trunk/linux-2.6/debian/bin/test-patches
   dists/trunk/linux-2.6/debian/config/amd64/defines
   dists/trunk/linux-2.6/debian/config/defines
   dists/trunk/linux-2.6/debian/config/i386/defines
   dists/trunk/linux-2.6/debian/patches/series/base-extra

Modified: dists/trunk/linux-2.6/debian/bin/test-patches
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/test-patches	Sat Jan 23 19:47:33 2010	(r14990)
+++ dists/trunk/linux-2.6/debian/bin/test-patches	Sun Jan 24 12:08:42 2010	(r14991)
@@ -8,7 +8,7 @@
 kernelabi="$(uname -r)"
 ff="${kernelabi#+([^-])-@(trunk|+([0-9]))-}"
 if [ "x$ff" != "x$kernelabi" ]; then
-    flavour="${ff#@(openvz|vserver|xen)-}"
+    flavour="${ff#@(vserver|xen)-}"
     if [ "x$flavour" != "x$ff" ]; then
 	featureset="${ff%-$flavour}"
     else

Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines	Sat Jan 23 19:47:33 2010	(r14990)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines	Sun Jan 24 12:08:42 2010	(r14991)
@@ -1,6 +1,5 @@
 [base]
 featuresets:
- openvz
  vserver
  xen
 flavours:

Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines	Sat Jan 23 19:47:33 2010	(r14990)
+++ dists/trunk/linux-2.6/debian/config/defines	Sun Jan 24 12:08:42 2010	(r14991)
@@ -19,13 +19,9 @@
 compiler: gcc-4.3
 featuresets:
  none
- openvz
  vserver
  xen
 
-[featureset-openvz_base]
-enabled: false
-
 [featureset-vserver_base]
 enabled: true
 

Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines	Sat Jan 23 19:47:33 2010	(r14990)
+++ dists/trunk/linux-2.6/debian/config/i386/defines	Sun Jan 24 12:08:42 2010	(r14991)
@@ -1,6 +1,5 @@
 [base]
 featuresets:
- openvz
  vserver
  xen
 flavours:

Modified: dists/trunk/linux-2.6/debian/patches/series/base-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base-extra	Sat Jan 23 19:47:33 2010	(r14990)
+++ dists/trunk/linux-2.6/debian/patches/series/base-extra	Sun Jan 24 12:08:42 2010	(r14991)
@@ -1,4 +1 @@
-#+ features/all/openvz/openvz.patch featureset=openvz
 
-#+ features/all/vserver/vs2.3.0.35.patch featureset=vserver
-#+ features/all/vserver/bindmount-dev.patch featureset=vserver