diff options
author | Gabriel Ionescu <gabriel.ionescu@enea.com> | 2016-12-16 15:03:25 +0100 |
---|---|---|
committer | Gabriel Ionescu <gabriel.ionescu@enea.com> | 2016-12-16 15:03:25 +0100 |
commit | 87efd6de7b2daf4b47e37a74aa06320d19a45bda (patch) | |
tree | 8bb63d09033a1cc0f08643004e04aa0c9aaac696 | |
parent | 81b078a1fdef559f34427a78a14e5b49ed663236 (diff) | |
download | enea-kernel-cache-87efd6de7b2daf4b47e37a74aa06320d19a45bda.tar.gz |
Split ip_nf.cfg into two separate fragments
Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>
-rw-r--r-- | cfg/net/ip_nf_y.cfg | 6 | ||||
-rw-r--r-- | cfg/net/ip_nf_y.scc | 4 | ||||
-rw-r--r-- | features/docker/docker.scc | 4 | ||||
-rw-r--r-- | features/netfilter/netfilter_y.cfg (renamed from cfg/net/ip_nf.cfg) | 6 | ||||
-rw-r--r-- | features/netfilter/netfilter_y.scc | 4 |
5 files changed, 15 insertions, 9 deletions
diff --git a/cfg/net/ip_nf_y.cfg b/cfg/net/ip_nf_y.cfg new file mode 100644 index 0000000..33ea2bf --- /dev/null +++ b/cfg/net/ip_nf_y.cfg | |||
@@ -0,0 +1,6 @@ | |||
1 | CONFIG_NF_NAT_IPV4=y | ||
2 | CONFIG_IP_NF_IPTABLES=y | ||
3 | CONFIG_IP_NF_NAT=y | ||
4 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
5 | # CONFIG_IP_NF_TARGET_NETMAP is not set | ||
6 | # CONFIG_IP_NF_TARGET_REDIRECT is not set | ||
diff --git a/cfg/net/ip_nf_y.scc b/cfg/net/ip_nf_y.scc new file mode 100644 index 0000000..cc32112 --- /dev/null +++ b/cfg/net/ip_nf_y.scc | |||
@@ -0,0 +1,4 @@ | |||
1 | define KFEATURE_DESCRIPTION "Enable Netfilter (IPv4) options as built-in" | ||
2 | define KFEATURE_COMPATIBILITY all | ||
3 | |||
4 | kconf non-hardware ip_nf_y.cfg | ||
diff --git a/features/docker/docker.scc b/features/docker/docker.scc deleted file mode 100644 index a47d356..0000000 --- a/features/docker/docker.scc +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | define KFEATURE_DESCRIPTION "Docker integration" | ||
2 | define KFEATURE_COMPATIBILITY all | ||
3 | |||
4 | kconf non-hardware cfg/net/ip_nf.cfg | ||
diff --git a/cfg/net/ip_nf.cfg b/features/netfilter/netfilter_y.cfg index 98fc5ad..26b731a 100644 --- a/cfg/net/ip_nf.cfg +++ b/features/netfilter/netfilter_y.cfg | |||
@@ -1,4 +1,5 @@ | |||
1 | CONFIG_NF_CONNTRACK=y | 1 | CONFIG_NF_CONNTRACK=y |
2 | CONFIG_NF_CONNTRACK_IPV4=y | ||
2 | CONFIG_NF_NAT=y | 3 | CONFIG_NF_NAT=y |
3 | CONFIG_NETFILTER_XTABLES=y | 4 | CONFIG_NETFILTER_XTABLES=y |
4 | CONFIG_NETFILTER_XT_NAT=y | 5 | CONFIG_NETFILTER_XT_NAT=y |
@@ -6,8 +7,3 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y | |||
6 | CONFIG_NF_DEFRAG_IPV4=y | 7 | CONFIG_NF_DEFRAG_IPV4=y |
7 | CONFIG_NF_CONNTRACK_IPV4=y | 8 | CONFIG_NF_CONNTRACK_IPV4=y |
8 | CONFIG_NF_NAT_IPV4=y | 9 | CONFIG_NF_NAT_IPV4=y |
9 | CONFIG_IP_NF_IPTABLES=y | ||
10 | CONFIG_IP_NF_NAT=y | ||
11 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
12 | # CONFIG_IP_NF_TARGET_NETMAP is not set | ||
13 | # CONFIG_IP_NF_TARGET_REDIRECT is not set | ||
diff --git a/features/netfilter/netfilter_y.scc b/features/netfilter/netfilter_y.scc new file mode 100644 index 0000000..f0e2e01 --- /dev/null +++ b/features/netfilter/netfilter_y.scc | |||
@@ -0,0 +1,4 @@ | |||
1 | define KFEATURE_DESCRIPTION "Enable netfilter + conn tracking as built-in modules" | ||
2 | define KFEATURE_COMPATIBILITY all | ||
3 | |||
4 | kconf non-hardware netfilter_y.cfg | ||