From 1d174d4e851b1dc74c4c4778cf7d0c52d1f38142 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 22 Jan 2020 18:02:40 +0000 Subject: bbappends: make distro feature safe Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-kernel/linux/linux-yocto_4.19.bbappend | 10 +--------- meta-openstack/recipes-kernel/linux/linux-yocto_5.2.bbappend | 10 +--------- meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc | 9 +++++++++ 3 files changed, 11 insertions(+), 18 deletions(-) create mode 100644 meta-openstack/recipes-kernel/linux/linux-yocto_openstack.inc (limited to 'meta-openstack/recipes-kernel') 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 \ + " -- cgit v1.2.3-54-g00ecf