aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHe Zhe <zhe.he@windriver.com>2019-02-27 15:41:30 +0800
committerBruce Ashfield <bruce.ashfield@gmail.com>2019-03-01 11:37:57 -0500
commitf037d515e9551862d5e036ba68be4615fda3b8be (patch)
tree95389e5b350c4a6b476e653fa9c69bc249de093a
parent8af736986dc0c24464119c513aca660400abce64 (diff)
downloadmeta-cloud-services-f037d515e9551862d5e036ba68be4615fda3b8be.tar.gz
meta-cloud-services-f037d515e9551862d5e036ba68be4615fda3b8be.tar.bz2
meta-cloud-services-f037d515e9551862d5e036ba68be4615fda3b8be.zip
kernel: Remove redundant config fragment
This fixes 01a28c32acb2 ("linux/nf.cfg: CONFIG_NF_CONNTRACK_IPV4 was replaced by CONFIG_NF_CONNTRACK") which duplicates a config fragment and causes the following warning. Warning: Value of CONFIG_NF_CONNTRACK is defined multiple times within fragment tmp-glibc/work-shared/intel-x86-64/kernel-source/.kernel-meta/configs/v4.19/standard/intel-x86/nf.cfg: CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK=y Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
index 1bf82ea..676a091 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
@@ -2,7 +2,6 @@ CONFIG_NF_CONNTRACK=y
CONFIG_NF_NAT=m
CONFIG_NF_NAT_NEEDED=y
CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_NAT=m