Split ip_nf.cfg into two separate fragments

Signed-off-by: Gabriel Ionescu <gabriel.ionescu@enea.com>

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 @@
+CONFIG_NF_NAT_IPV4=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# 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 @@
+define KFEATURE_DESCRIPTION "Enable Netfilter (IPv4) options as built-in"
+define KFEATURE_COMPATIBILITY all
+
+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 @@
-define KFEATURE_DESCRIPTION "Docker integration"
-define KFEATURE_COMPATIBILITY all
-
-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 @@
 CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_NAT=y
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_NAT=y
@@ -6,8 +7,3 @@ CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
 CONFIG_NF_DEFRAG_IPV4=y
 CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_NAT_IPV4=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# 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 @@
+define KFEATURE_DESCRIPTION "Enable netfilter + conn tracking as built-in modules"
+define KFEATURE_COMPATIBILITY all
+
+kconf non-hardware netfilter_y.cfg