From da074de37f3f49ff70644bf37178e31d1ca0f065 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 15 May 2014 16:34:38 +0200 Subject: remove subpackage ip6tables --- target/linux/config/Config.in.netfilter | 18 +++++++++++------- target/linux/config/Config.in.netfilter.core | 5 ++++- target/linux/config/Config.in.netfilter.ip4 | 27 ++++----------------------- target/linux/config/Config.in.netfilter.ip6 | 14 +++++++++++--- 4 files changed, 30 insertions(+), 34 deletions(-) (limited to 'target/linux') diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index 2fc23225c..f07302981 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -1,29 +1,33 @@ menu "Netfilter (Firewall/Filtering)" config ADK_KERNEL_NETFILTER - bool + boolean + default y if ADK_PACKAGE_IPTABLES default n config ADK_KERNEL_NETFILTER_ADVANCED - bool + boolean + default y if ADK_PACKAGE_IPTABLES default n config ADK_KERNEL_BRIDGE_NETFILTER - bool + boolean + default y if ADK_PACKAGE_EBTABLES default n config ADK_KERNEL_NETFILTER_XTABLES - bool + boolean select ADK_KERNEL_NETFILTER select ADK_KERNEL_NETFILTER_ADVANCED + default y if ADK_PACKAGE_IPTABLES default n config ADK_KERNEL_NETFILTER_DEBUG - bool + boolean default n config ADK_KERNEL_IP_NF_MATCH_LAYER7_DEBUG - bool + boolean default n config ADK_KERNEL_IP_NF_TARGET_MIRROR @@ -75,7 +79,7 @@ config ADK_KERNEL_IP6_NF_IPTABLES default n config ADK_KERNEL_IP_ROUTE_FWMARK - bool + boolean default n config ADK_KERNEL_IP_NF_QUEUE diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core index 16da9707f..d5665bbdc 100644 --- a/target/linux/config/Config.in.netfilter.core +++ b/target/linux/config/Config.in.netfilter.core @@ -5,8 +5,11 @@ config ADK_KERNEL_NETFILTER_NETLINK_LOG for logging packets via NFNETLINK. config ADK_KERNEL_NF_CONNTRACK - tristate 'Netfilter connection tracking support' + prompt 'Netfilter connection tracking support' + tristate select ADK_KERNEL_NETFILTER_XTABLES + default m if ADK_PACKAGE_IPTABLES + default n help Connection tracking keeps a record of what packets have passed through your machine, in order to figure out how they are related diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index db3207af8..075fabd1c 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -1,5 +1,6 @@ config ADK_KERNEL_NF_CONNTRACK_IPV4 - bool 'IPv4 connection tracking support (required for NAT)' + prompt 'IPv4 connection tracking support (required for NAT)' + tristate select ADK_KERNEL_NF_CONNTRACK default m if ADK_PACKAGE_IPTABLES default n @@ -39,23 +40,8 @@ config ADK_KERNEL_IP_NF_FILTER rules for simple packet filtering at local input, forwarding and local output. See the man page for iptables(8). -config ADK_KERNEL_FULL_NAT - tristate "Meta package for Full NAT" - select ADK_KERNEL_NF_NAT if ADK_KERNEL_VERSION_3_4_87 - select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_10_37 - select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10 - select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_18 - select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_11 - select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_14_4 - select ADK_KERNEL_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_15_RC5 - default m if ADK_PACKAGE_IPTABLES - default n - config ADK_KERNEL_NF_NAT - tristate 'Full NAT' - depends on ADK_KERNEL_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_4_87 - default m if ADK_PACKAGE_IPTABLES + tristate default n help The Full NAT option allows masquerading, port forwarding and other @@ -64,13 +50,8 @@ config ADK_KERNEL_NF_NAT config ADK_KERNEL_NF_NAT_IPV4 tristate 'Full NAT' + select ADK_KERNEL_NF_NAT depends on ADK_KERNEL_IP_NF_IPTABLES - depends on ADK_KERNEL_VERSION_3_10_37 \ - || ADK_KERNEL_VERSION_3_11_10 \ - || ADK_KERNEL_VERSION_3_12_18 \ - || ADK_KERNEL_VERSION_3_13_11 \ - || ADK_KERNEL_VERSION_3_14_4 \ - || ADK_KERNEL_VERSION_3_15_RC5 default m if ADK_PACKAGE_IPTABLES default n help diff --git a/target/linux/config/Config.in.netfilter.ip6 b/target/linux/config/Config.in.netfilter.ip6 index 33588a071..1999f21b6 100644 --- a/target/linux/config/Config.in.netfilter.ip6 +++ b/target/linux/config/Config.in.netfilter.ip6 @@ -1,8 +1,11 @@ config ADK_KERNEL_NF_CONNTRACK_IPV6 - tristate "IPv6 connection tracking support" + prompt "IPv6 connection tracking support" + tristate select ADK_KERNEL_NF_CONNTRACK select ADK_KERNEL_IPV6 - ---help--- + default y if ADK_TARGET_IPTABLES + default n + help Connection tracking keeps a record of what packets have passed through your machine, in order to figure out how they are related into connections. @@ -17,6 +20,8 @@ config ADK_KERNEL_IP6_NF_IPTABLES tristate "IP6 tables support (required for filtering)" select ADK_KERNEL_NETFILTER_XTABLES select ADK_KERNEL_IPV6 + default y if ADK_TARGET_IPTABLES + default n help ip6tables is a general, extensible packet identification framework. Currently only the packet filtering and packet mangling subsystem @@ -86,7 +91,10 @@ config ADK_KERNEL_IP6_NF_MATCH_RT # The targets config ADK_KERNEL_IP6_NF_FILTER - tristate "Packet filtering" + prompt "Packet filtering" + tristate + default y if ADK_TARGET_IPTABLES + default n help Packet filtering defines a table `filter', which has a series of rules for simple packet filtering at local input, forwarding and -- cgit v1.2.3