5 files changed, 2 insertions, 17 deletions
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg
index 6e1cff73..91b82099 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto/iptables-nat.cfg
@@ -1,7 +1,5 @@
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -12,7 +10,6 @@ CONFIG_NETFILTER_XT_TARGET_NETMAP=m
 
 CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
 
-CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_NETMAP=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
index 676a0914..5821a43d 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg
@@ -1,7 +1,3 @@
 CONFIG_NF_CONNTRACK=y
 CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_NAT=m
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_5.0.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_5.0.bbappend
deleted file mode 100644
index 843546c8..00000000
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_5.0.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://enable-veth.cfg \
-            file://enable-iscsi-tcp.cfg \
-            file://enable-nbd.cfg \
-            file://enable-rtlink.cfg \
-            file://nf.scc \
-            file://nfs.scc \
-	"
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_5.4.bbappend
new file mode 100644
index 00000000..025ee4ee
--- /dev/null
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_5.4.bbappend
@@ -0,0 +1 @@
+require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc
index 843546c8..4faab108 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto:"
 
 SRC_URI += "file://enable-veth.cfg \
             file://enable-iscsi-tcp.cfg \