port over the netfilter module packaging to the new system and fix iptables dependencies

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4206 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 169 insertions, 8 deletions

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 54a94f2c9..99ef3347c 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -49,7 +49,7 @@ endef
 define Package/iptables-mod-conntrack
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-conntrack
 TITLE:=connection tracking modules
 DESCRIPTION:=iptables extensions for connection tracking \\\
 Includes: \\\
@@ -61,7 +61,7 @@ endef
 define Package/iptables-mod-filter
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-filter
 TITLE:=filter modules
 DESCRIPTION:=iptables extensions for packet content inspection\\\
 Includes: \\\
@@ -73,7 +73,7 @@ define Package/iptables-mod-imq
 SECTION:=net
 CATEGORY:=Base system
 DEPENDS:=iptables
-TITLE:=IMQ support
+TITLE:=IMQ support +kmod-imq
 DESCRIPTION:=iptables extension for IMQ support\\\
 Includes: \\\
 	* libipt_IMQ
@@ -82,7 +82,7 @@ endef
 define Package/iptables-mod-ipopt
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-ipopt
 TITLE:=IP/Packet option modules
 DESCRIPTION:=iptables extensions for matching/changing IP packet options\\\
 Includes: \\\
@@ -99,7 +99,7 @@ endef
 define Package/iptables-mod-ipsec
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-ipsec
 TITLE:=IPSec extensions
 DESCRIPTION:=iptables extensions for matching ipsec traffic\\\
 Includes: \\\
@@ -110,7 +110,7 @@ endef
 define Package/iptables-mod-nat
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-nat
 TITLE:=extra NAT targets
 DESCRIPTION:=iptables extensions for different NAT targets\\\
 Includes: \\\
@@ -120,7 +120,7 @@ endef
 define Package/iptables-mod-ulog
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-ulog
 TITLE:=user-space packet logging
 DESCRIPTION:=iptables extensions for user-space packet logging\\\
 Includes: \\\
@@ -130,7 +130,7 @@ endef
 define Package/iptables-mod-extra
 SECTION:=net
 CATEGORY:=Base system
-DEPENDS:=iptables
+DEPENDS:=iptables +kmod-ipt-extra
 TITLE:=other extra iptables extensions
 DESCRIPTION:=other extra iptables extensions\\\
 Includes: \\\
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 14fcda288..39978ab9f 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -18,6 +18,7 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
 -include $(LINUX_DIR)/.config
+NF_KMOD:=1
 include $(INCLUDE_DIR)/netfilter.mk
 endif
 
diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk
index ff979cf86..f1e1009d1 100644
--- a/package/kernel/modules.mk
+++ b/package/kernel/modules.mk
@@ -63,4 +63,164 @@ AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
 endef
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+NFMENU:=Netfilter Extensions
+
+define KernelPackage/ipt-conntrack
+TITLE:=Modules for connection tracking
+DESCRIPTION:=Netfilter (IPv4) kernel modules for connection tracking\\\
+Includes: \\\
+	* ipt_conntrack \\\
+	* ipt_helper \\\
+	* ipt_connmark/CONNMARK
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-conntrack))
+
+
+define KernelPackage/ipt-filter
+TITLE:=Modules for packet content inspection
+DESCRIPTION:=Netfilter (IPv4) kernel modules for packet content inspection \\\
+Includes: \\\
+	* ipt_ipp2p \\\
+	* ipt_layer7
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-filter))
+
+
+define KernelPackage/ipt-ipopt
+TITLE:=Modules for matching/changing IP packet options
+DESCRIPTION:=Netfilter (IPv4) modules for matching/changing IP packet options \\\
+Includes: \\\
+	* ipt_dscp/DSCP \\\
+	* ipt_ecn/ECN \\\
+	* ipt_length \\\
+	* ipt_mac \\\
+	* ipt_tos/TOS \\\
+	* ipt_tcpmms \\\
+	* ipt_ttl/TTL \\\
+	* ipt_unclean
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-ipopt))
+
+
+define KernelPackage/ipt-ipsec
+TITLE:=Modules for matching IPSec packets
+DESCRIPTION:=Netfilter (IPv4) modules for matching IPSec packets \\\
+Includes: \\\
+	* ipt_ah \\\
+	* ipt_esp
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-ipsec))
+
+
+define KernelPackage/ipt-nat
+TITLE:=Modules for extra NAT targets
+DESCRIPTION:=Netfilter (IPv4) modules for extra NAT targets \\\
+Includes: \\\
+	* ipt_REDIRECT \\\
+	* ipt_NETMAP
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-nat))
+
+define KernelPackage/ipt-nathelper
+TITLE:=Extra Conntrack and NAT helpers
+DESCRIPTION:=Extra Conntrack and NAT helpers (IPv4) \\\
+Includes: \\\
+	* ip_conntrack_amanda \\\
+	* ip_conntrack_proto_gre \\\
+	* ip_nat_proto_gre \\\
+	* ip_conntrack_pptp \\\
+	* ip_nat_pptp \\\
+	* ip_conntrack_sip \\\
+	* ip_nat_sip \\\
+	* ip_nat_snmp_basic \\\
+	* ip_conntrack_tftp
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-nathelper))
+
+define KernelPackage/ipt-imq
+TITLE:=Intermediate Queueing support
+DESCRIPTION:=Kernel support for Intermediate Queueing devices
+KCONFIG:=$(CONFIG_IMQ)
+SUBMENU:=$(NFMENU)
+FILES:= \
+	$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,imq))
+
+
+define KernelPackage/ipt-queue
+TITLE:=Module for user-space packet queueing
+DESCRIPTION:=Netfilter (IPv4) module for user-space packet queueing \\\
+Includes: \\\
+	* ipt_QUEUE
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-queue))
+
+define KernelPackage/ipt-ulog
+TITLE:=Module for user-space packet logging
+DESCRIPTION:=Netfilter (IPv4) module for user-space packet logging \\\
+Includes: \\\
+	* ipt_ULOG
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-ulog))
+
+define KernelPackage/ipt-extra
+TITLE:=Extra modules
+DESCRIPTION:=Other Netfilter (IPv4) kernel modules\\\
+Includes: \\\
+	* ipt_limit \\\
+	* ipt_owner \\\
+	* ipt_physdev \\\
+	* ipt_pkttype \\\
+	* ipt_recent
+SUBMENU:=$(NFMENU)
+FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
+endef
+$(eval $(call KernelPackage,ipt-extra))
+
+define KernelPackage/ip6tables
+TITLE:=IPv6 modules
+DESCRIPTION:=Netfilter IPv6 firewalling support
+SUBMENU:=$(NFMENU)
+FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,ip6tables))
+
+
+define KernelPackage/arptables
+TITLE:=ARP firewalling modules
+DESCRIPTION:=Kernel modules for ARP firewalling
+SUBMENU:=$(NFMENU)
+FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_IP_NF_ARPTABLES)
+endef
+$(eval $(call KernelPackage,arptables))
+
+
+define KernelPackage/ebtables
+TITLE:=Bridge firewalling modules
+DESCRIPTION:=Kernel modules for Ethernet Bridge firewalling
+SUBMENU:=$(NFMENU)
+FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
+KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
+endef
+$(eval $(call KernelPackage,ebtables))
+