Author: zbyniu Date: Sun Jan 27 23:13:16 2008 GMT Module: SPECS Tag: LINUX_2_6 ---- Log message: - some changes ported from LINUX_2_6_22 (bcond_without ipv6, ipvs-nfct.patch rndis_host-wm5.patch) - kernel-pom-ng-ROUTE.patch is back
---- Files affected: SPECS: kernel.spec (1.441.2.1829 -> 1.441.2.1830) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1829 SPECS/kernel.spec:1.441.2.1830 --- SPECS/kernel.spec:1.441.2.1829 Sat Jan 26 16:49:46 2008 +++ SPECS/kernel.spec Mon Jan 28 00:13:10 2008 @@ -41,6 +41,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 tuxonice # support for tuxonice (ex-Suspend2) (enabled by default) @@ -207,7 +208,7 @@ Patch11: kernel-pom-ng-ipv4options.patch Patch12: kernel-pom-ng-set.patch Patch13: kernel-pom-ng-u32.patch - +Patch14: kernel-pom-ng-ROUTE.patch Patch15: kernel-pom-ng-TARPIT.patch Patch16: kernel-pom-ng-mms-conntrack-nat.patch Patch17: kernel-pom-ng-IPMARK.patch @@ -230,6 +231,9 @@ # netfilter-layer7-v2.13.tar.gz from http://l7-filter.sf.net/ Patch40: kernel-layer7.patch +# http://www.ssi.bg/~ja/nfct/ipvs-nfct-2.6.24-1.diff +Patch41: kernel-ipvs-nfct.patch + ### End netfilter # based on http://www.linuximq.net/patchs/linux-2.6.21-img2.diff with 2.6.23 fixes @@ -258,6 +262,9 @@ # http://www.ntop.org/PF_RING.html 20070610 Patch58: linux-PF_RING.patch +# http://synce.svn.sourceforge.net/svnroot/synce/trunk/patches/linux-2.6.22-rndis_host-wm5.patch +Patch59: kernel-rndis_host-wm5.patch + # Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2 Patch60: linux-2.6-sk98lin_v10.0.4.3.patch # potrzebuje modyfikacji, ale jest zbyt rano @@ -723,7 +730,7 @@ %endif # squashfs -%patch6 -p1 +%patch6 -p1 %patch9 -p1 @@ -742,6 +749,9 @@ # kernel-pom-ng-u32.patch %patch13 -p1 +# kernel-pom-ng-ROUTE.patch +%patch14 -p1 + # kernel-pom-ng-TARPIT.patch %patch15 -p1 @@ -784,6 +794,9 @@ # kernel-layer7.patch %patch40 -p1 +# ipvs-nfct +%patch41 -p1 + ## # end of netfilter @@ -812,6 +825,9 @@ %patch58 -p1 +# kernel-rndis_host-wm5.patch +%patch59 -p1 + # linux-2.6-sk98lin_v10.0.4.3.patch #patch60 -p1 @@ -1060,6 +1076,10 @@ %endif %endif +%if %{without ipv6} + sed -i "s:CONFIG_IPV6=.:# CONFIG_IPV6 is not set:" arch/%{_target_base_arch_dir}/defconfig +%endif + # vesafb-tng cat %{SOURCE44} >> arch/%{_target_base_arch_dir}/defconfig @@ -1583,6 +1603,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1830 2008-01-27 23:13:10 zbyniu +- some changes ported from LINUX_2_6_22 (bcond_without ipv6, ipvs-nfct.patch + rndis_host-wm5.patch) +- kernel-pom-ng-ROUTE.patch is back + Revision 1.441.2.1829 2008-01-26 15:49:46 arekm - 2.6.24 final ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1829&r2=1.441.2.1830&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
