SPECS (LINUX_2_6): kernel.spec - vs22: not applicable, not usable, buuum!

[pluto]

Author: pluto                        Date: Thu Sep 18 09:28:48 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- vs22: not applicable, not usable, buuum!

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1950 -> 1.441.2.1951) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1950 SPECS/kernel.spec:1.441.2.1951
--- SPECS/kernel.spec:1.441.2.1950	Tue Sep 16 22:32:48 2008
+++ SPECS/kernel.spec	Thu Sep 18 11:28:41 2008
@@ -36,7 +36,6 @@
 
 %bcond_without	vserver		# support for VServer (enabled by default)
 %bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
-%bcond_with	vs22		# use vserver 2.2 instead of 2.3 (see comment near patch 102)
 %bcond_with	apparmor	# build kernel with apparmor (very exerimental mix)
 
 %bcond_with	rescuecd	# build kernel for our rescue
@@ -291,11 +290,6 @@
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	kernel-vserver-fixes.patch
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.24-rc7-vs2.2.0.5.0.7-pre.diff
-Patch102:	linux-2.6-vs2.2.patch
-# note about vserver 2.2 vs 2.3: 2.2 is "stable", 2.3 is "development", currently (2007-09-03)
-# the preferred 2.3 vserver needs CONFIG_IPV6=y config, which break things for some users;
-# it was proposed to use 2.2 as a temp replacement. One could use vs 2.2 instead of 2.3
-# by using vs22 bcond - this bcond also changes IPV6 option from "y" to "m".
 
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
 #Patch120: xen-3.0-2.6.16.patch
@@ -843,13 +837,9 @@
 
 # vserver
 %if %{with vserver}
-%if %{with vs22}
-%patch102 -p1
-%else
 %patch100 -p1
 %patch101 -p1
 %endif
-%endif
 
 #%if %{with xen0} || %{with xenU}
 #%ifarch %{ix86} %{x8664} ia64
@@ -1090,9 +1080,6 @@
 
 %if %{with vserver}
 	cat %{SOURCE43} >> %{defconfig}
-%if %{with vs22}
-	sed -i "s:CONFIG_IPV6=y:CONFIG_IPV6=m:" %{defconfig}
-%endif
 %endif
 
 %if %{without ipv6}
@@ -1693,6 +1680,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1951  2008/09/18 09:28:41  pluto
+- vs22: not applicable, not usable, buuum!
+
 Revision 1.441.2.1950  2008/09/16 20:32:48  blues
 - CVE note
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1950&r2=1.441.2.1951&f=u