Author: zbyniu Date: Fri Nov 16 16:35:29 2007 GMT Module: SPECS Tag: LINUX_2_6_22 ---- Log message: - bcond_without ipv6 added
---- Files affected: SPECS: kernel.spec (1.441.2.1796.2.20 -> 1.441.2.1796.2.21) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1796.2.20 SPECS/kernel.spec:1.441.2.1796.2.21 --- SPECS/kernel.spec:1.441.2.1796.2.20 Wed Nov 7 11:21:51 2007 +++ SPECS/kernel.spec Fri Nov 16 17:35:23 2007 @@ -1,6 +1,6 @@ # $Revision$, $Date$ # -# STATUS: 2.6.22.10 ready, needs testing +# STATUS: 2.6.22.12 ready # # TODO: # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686 @@ -39,6 +39,7 @@ %bcond_without imq # imq support %bcond_without wrr # wrr support +%bcond_without ipv6 # ipv6 support %bcond_without vserver # support for VServer (enabled by default) %bcond_without suspend2 # support for Suspend2 (enabled by default) @@ -308,7 +309,7 @@ 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 +# 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 @@ -1139,10 +1140,14 @@ %endif %endif +%if %{without ipv6} + sed -i "s:CONFIG_IPV6=.:# CONFIG_IPV6 is not set:" arch/%{_target_base_arch}/defconfig +%endif + # vesafb-tng cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig -# grsecurity & pax stuff - temporary - work in progress +# grsecurity & pax stuff # %if %{with pax_full} @@ -1687,6 +1692,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1796.2.21 2007-11-16 16:35:23 zbyniu +- bcond_without ipv6 added + Revision 1.441.2.1796.2.20 2007-11-07 10:21:51 glen - add TIOCGDEV.patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.20&r2=1.441.2.1796.2.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
