cosmetic fixes: rearrange KernelPackage definitions

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

1 files changed, 43 insertions, 16 deletions

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index a25dbdef7..94c715216 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -10,6 +10,7 @@ NFMENU:=Netfilter Extensions
 include $(INCLUDE_DIR)/netfilter.mk
 
 define KernelPackage/ipt-conntrack
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for connection tracking
   DESCRIPTION:=\
 	Netfilter (IPv4) kernel modules for connection tracking\\\
@@ -20,12 +21,14 @@ define KernelPackage/ipt-conntrack
 	- ipt_connmark/CONNMARK
   KCONFIG:=$(KCONFIG_IPT_CONNTRACK)
   FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-conntrack))
 
+
 define KernelPackage/ipt-filter
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for packet content inspection
   DESCRIPTION:=\
 	Netfilter (IPv4) kernel modules for packet content inspection \\\
@@ -35,12 +38,14 @@ define KernelPackage/ipt-filter
 	- ipt_layer7
   KCONFIG:=$(KCONFIG_IPT_FILTER)
   FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-filter))
 
+
 define KernelPackage/ipt-ipopt
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for matching/changing IP packet options
   DESCRIPTION:=\
 	Netfilter (IPv4) modules for matching/changing IP packet options \\\
@@ -57,12 +62,14 @@ define KernelPackage/ipt-ipopt
 	- ipt_unclean
   KCONFIG:=$(KCONFIG_IPT_IPOPT)
   FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ipopt))
 
+
 define KernelPackage/ipt-ipsec
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for matching IPSec packets
   DESCRIPTION:=\
 	Netfilter (IPv4) modules for matching IPSec packets \\\
@@ -72,12 +79,14 @@ define KernelPackage/ipt-ipsec
 	- ipt_esp
   KCONFIG:=$(KCONFIG_IPT_IPSEC)
   FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ipsec))
 
+
 define KernelPackage/ipt-nat
+  SUBMENU:=$(NFMENU)
   TITLE:=Modules for extra NAT targets
   DESCRIPTION:=\
 	Netfilter (IPv4) modules for extra NAT targets \\\
@@ -87,12 +96,14 @@ define KernelPackage/ipt-nat
 	- ipt_NETMAP
   KCONFIG:=$(KCONFIG_IPT_NAT)
   FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-nat))
 
+
 define KernelPackage/ipt-nathelper
+  SUBMENU:=$(NFMENU)
   TITLE:=Default Conntrack and NAT helpers
   DESCRIPTION:=\
 	Default Netfilter (IPv4) Conntrack and NAT helpers \\\
@@ -105,12 +116,14 @@ define KernelPackage/ipt-nathelper
 	- ip_conntrack_tftp
   KCONFIG:=$(KCONFIG_IPT_NAT_DEFAULT)
   FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-nathelper))
 
+
 define KernelPackage/ipt-nathelper-extra
+  SUBMENU:=$(NFMENU)
   TITLE:=Extra Conntrack and NAT helpers
   DESCRIPTION:=\
 	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
@@ -126,24 +139,27 @@ define KernelPackage/ipt-nathelper-extra
 	- ip_nat_snmp_basic
   KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
   FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-nathelper-extra))
 
+
 define KernelPackage/ipt-imq
+  SUBMENU:=$(NFMENU)
   TITLE:=Intermediate Queueing support
   DESCRIPTION:=\
 	Kernel support for Intermediate Queueing devices
   KCONFIG:=CONFIG_IP_NF_TARGET_IMQ
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,ipt-imq))
 
 
 define KernelPackage/ipt-queue
+  SUBMENU:=$(NFMENU)
   TITLE:=Module for user-space packet queueing
   DESCRIPTION:=\
 	Netfilter (IPv4) module for user-space packet queueing \\\
@@ -152,12 +168,14 @@ define KernelPackage/ipt-queue
 	- ipt_QUEUE
   KCONFIG:=$(KCONFIG_IPT_QUEUE)
   FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-queue))
 
+
 define KernelPackage/ipt-ulog
+  SUBMENU:=$(NFMENU)
   TITLE:=Module for user-space packet logging
   DESCRIPTION:=\
 	Netfilter (IPv4) module for user-space packet logging \\\
@@ -166,12 +184,14 @@ define KernelPackage/ipt-ulog
 	- ipt_ULOG
   KCONFIG:=$(KCONFIG_IPT_ULOG)
   FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ulog))
 
+
 define KernelPackage/ipt-iprange
+  SUBMENU:=$(NFMENU)
   TITLE:=Module for matching ip ranges
   DESCRIPTION:=\
 	Netfilter (IPv4) module for matching ip ranges \\\
@@ -179,24 +199,27 @@ define KernelPackage/ipt-iprange
 	Includes: \\\
 	- ipt_IPRANGE
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/ipt_iprange.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-iprange))
 
+
 define KernelPackage/ipt-ipset
+  SUBMENU:=$(NFMENU)
   TITLE:=IPSET Modules
   DESCRIPTION:=\
   	Netfilter kernel modules for ipset
   KCONFIG:=$(KCONFIG_IPT_IPSET)
   FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSET-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-ipset))
 
 
 define KernelPackage/ipt-extra
+  SUBMENU:=$(NFMENU)
   TITLE:=Extra modules
   DESCRIPTION:=\
 	Other Netfilter (IPv4) kernel modules\\\
@@ -210,43 +233,47 @@ define KernelPackage/ipt-extra
 	- xt_NOTRACK 
   KCONFIG:=$(KCONFIG_IPT_EXTRA)
   FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m)))
 endef
+
 $(eval $(call KernelPackage,ipt-extra))
 
+
 define KernelPackage/ip6tables
+  SUBMENU:=$(NFMENU)
   TITLE:=IPv6 modules
   DESCRIPTION:=\
 	Netfilter IPv6 firewalling support
   KCONFIG:=CONFIG_IP6_NF_IPTABLES
   FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,ip6tables))
 
 
 define KernelPackage/arptables
+  SUBMENU:=$(NFMENU)
   TITLE:=ARP firewalling modules
   DESCRIPTION:=\
 	Kernel modules for ARP firewalling
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_IP_NF_ARPTABLES
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,arptables))
 
 
 define KernelPackage/ebtables
+  SUBMENU:=$(NFMENU)
   TITLE:=Bridge firewalling modules
   DESCRIPTION:=\
 	Kernel modules for Ethernet Bridge firewalling
   DEPENDS:=@LINUX_2_6
   FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES
-  SUBMENU:=$(NFMENU)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
 $(eval $(call KernelPackage,ebtables))