From a401a1c3d86eb00bab8bfccba83c12cc67ce06a1 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 22 Jan 2020 17:49:50 +0000 Subject: qemu: make bbappend distro feature conditional Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend | 9 --------- meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend | 1 + meta-openstack/recipes-devtools/qemu/qemu_openstack.inc | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend create mode 100644 meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend create mode 100644 meta-openstack/recipes-devtools/qemu/qemu_openstack.inc diff --git a/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend deleted file mode 100644 index ad1ea25..0000000 --- a/meta-openstack/recipes-devtools/qemu/qemu_2.%.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," -PACKAGECONFIG[libseccomp] = "--enable-seccomp,--disable-seccomp,libseccomp,libseccomp" - -PACKAGECONFIG ?= "fdt virtfs libcap-ng" -PACKAGECONFIG_x86 ?= "fdt spice virtfs libcap-ng" -PACKAGECONFIG_x86-64 ?= "fdt spice virtfs libcap-ng" - -PACKAGECONFIG_class-native = "fdt" -PACKAGECONFIG_class-nativesdk = "fdt" diff --git a/meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend new file mode 100644 index 0000000..025ee4e --- /dev/null +++ b/meta-openstack/recipes-devtools/qemu/qemu_4.%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('DISTRO_FEATURES', 'openstack', '${BPN}_openstack.inc', '', d)} diff --git a/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc b/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc new file mode 100644 index 0000000..ad1ea25 --- /dev/null +++ b/meta-openstack/recipes-devtools/qemu/qemu_openstack.inc @@ -0,0 +1,9 @@ +PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," +PACKAGECONFIG[libseccomp] = "--enable-seccomp,--disable-seccomp,libseccomp,libseccomp" + +PACKAGECONFIG ?= "fdt virtfs libcap-ng" +PACKAGECONFIG_x86 ?= "fdt spice virtfs libcap-ng" +PACKAGECONFIG_x86-64 ?= "fdt spice virtfs libcap-ng" + +PACKAGECONFIG_class-native = "fdt" +PACKAGECONFIG_class-nativesdk = "fdt" -- cgit v1.2.3-54-g00ecf