Author: mguevara Date: Mon Sep 3 12:05:29 2007 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- 2.6.22.6-0.2, introduced vs22 bcond, which enables use of vserver 2.2
instead of 2.3 line; when vs22 is choosed we should have IPV6 compiled
as an module; patch102 linux-2.6-vs2.2.patch (re)added
---- Files affected:
SPECS:
kernel.spec (1.441.2.1779 -> 1.441.2.1780)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1779 SPECS/kernel.spec:1.441.2.1780
--- SPECS/kernel.spec:1.441.2.1779 Fri Aug 31 13:47:00 2007
+++ SPECS/kernel.spec Mon Sep 3 14:05:24 2007
@@ -46,6 +46,8 @@
%bcond_without vserver # support for VServer (enabled by default)
%bcond_without suspend2 # support for Suspend2 (enabled by default)
+%bcond_with vs22 # use vserver 2.2 instead of 2.3 (see comment
near patch 102)
+
%{?debug:%define with_verbose 1}
%if %{without grsecurity}
@@ -118,7 +120,7 @@
%define _prepatch %{nil}
%define _pre_rc %{nil}
%define _rc %{nil}
-%define _rel 0.1
+%define _rel 0.2
%define subname
%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
%define _netfilter_snap 20070806
@@ -304,6 +306,12 @@
# based on
http://vserver.13thfloor.at/Experimental/patch-2.6.22.1-vs2.3.0.15.diff
Patch100: linux-2.6-vs2.3.patch
Patch101: linux-2.6-vs2.1-suspend2.patch
+# based on
http://vserver.13thfloor.at/Experimental/patch-2.6.22.2-vs2.2.0.3.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 couuld 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
@@ -870,7 +878,11 @@
# vserver
%if %{with vserver}
+%if %{with vs22}
+%patch102 -p1
+%else
%patch100 -p1
+%endif
%ifarch %{ix86} %{x8664} ia64
%patch101 -p1
%endif
@@ -1093,6 +1105,9 @@
%endif
%if %{with vserver}
cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
+%if %{with vs22}
+ sed -i "s:CONFIG_IPV6=y:CONFIG_IPV6=m:"
arch/%{_target_base_arch}/defconfig
+%endif
%endif
# vesafb-tng
@@ -1639,6 +1654,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1780 2007/09/03 12:05:24 mguevara
+- 2.6.22.6-0.2, introduced vs22 bcond, which enables use of vserver 2.2
+ instead of 2.3 line; when vs22 is choosed we should have IPV6 compiled
+ as an module; patch102 linux-2.6-vs2.2.patch (re)added
+
Revision 1.441.2.1779 2007/08/31 11:47:00 tommat
- no net-rndis on sparc
- builds now
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1779&r2=1.441.2.1780&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
