[kernel] add textsearch, NF_CONNTRACK_AMANDA and NETFILTER_XT_MATCH_STRING need it.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14778 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 5817595..6c813bb 100644 (file)
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -79,7 +79,7 @@ define KernelPackage/ipt-filter
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m)))
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m)))

-  DEPENDS:= kmod-ipt-core
+  DEPENDS:= kmod-ipt-core +kmod-textsearch

 endef
 
 define KernelPackage/ipt-filter/description
 endef
 
 define KernelPackage/ipt-filter/description


@@ -203,7 +203,7 @@ define KernelPackage/ipt-nathelper-extra
   KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m)))
   KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA)
   FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m)))

-  DEPENDS:= kmod-ipt-core +kmod-ipt-nat
+  DEPENDS:= kmod-ipt-core +kmod-ipt-nat +kmod-textsearch

 endef
 
 define KernelPackage/ipt-nathelper-extra/description
 endef
 
 define KernelPackage/ipt-nathelper-extra/description

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 87e92b9..1e6c1db 100644 (file)
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -766,3 +766,23 @@ define KernelPackage/cs5535-gpio/description
 endef
 
 $(eval $(call KernelPackage,cs5535-gpio))
 endef
 
 $(eval $(call KernelPackage,cs5535-gpio))

+
+
+define KernelPackage/textsearch
+SUBMENU:=$(OTHER_MENU)
+  TITLE:=Textsearch support is selected if needed
+  DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21
+  KCONFIG:= \
+    CONFIG_TEXTSEARCH=y \
+    CONFIG_TEXTSEARCH_KMP \
+    CONFIG_TEXTSEARCH_BM \
+    CONFIG_TEXTSEARCH_FSM
+  FILES:= \
+    $(LINUX_DIR)/lib/ts_kmp.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/lib/ts_bm.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/lib/ts_fsm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,ts_kmp ts_bm ts_fsm)
+endef
+
+$(eval $(call KernelPackage,textsearch))
+