bbappends: make distro feature safe

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

3 files changed, 11 insertions, 18 deletions

diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend
index 843546c..025ee4e 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend
@@ -1,9 +1 @@
-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 \
-        "
+require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_5.2.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_5.2.bbappend
index 843546c..025ee4e 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_5.2.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_5.2.bbappend
@@ -1,9 +1 @@
-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 \
-        "
+require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)}
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc b/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc
new file mode 100644
index 0000000..843546c
--- /dev/null
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc
@@ -0,0 +1,9 @@
+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 \
+        "