From 7708d3c557939d7d779a6caa8b517856ca27f135 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 9 Feb 2023 16:53:13 -0800 Subject: qemu: May end up depending on libmali, set PACKAGE_ARCH If qemu ends up depending on libmali, we want to set the PACKAGE_ARCH to machine value as this version is now machine specific. Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb | 5 +++++ meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'meta-xilinx-core/recipes-devtools/qemu') diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb index bc7b17b2..6c1851ba 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2023.1.bb @@ -3,6 +3,11 @@ require recipes-devtools/qemu/qemu.inc require qemu-xilinx-7.1.inc require qemu-alt.inc +# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific +DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}" +MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}" +PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}" + BBCLASSEXTEND = "nativesdk" RDEPENDS:${PN}:class-target += "bash" diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend index 9140060e..83768622 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend @@ -1 +1,6 @@ require qemu-alt.inc + +# Links to libmali-xlnx, so it becomes MACHINE_ARCH specific +DEFAULT_PACKAGE_ARCH := "${PACKAGE_ARCH}" +MALI_PACKAGE_ARCH = "${@'${MACHINE_ARCH}' if d.getVar('PREFERRED_PROVIDER_virtual/libgles1') == 'libmali-xlnx' else '${DEFAULT_PACKAGE_ARCH}'}" +PACKAGE_ARCH:class-target = "${@bb.utils.contains_any('DEPENDS', 'libepoxy virglrenderer', '${MALI_PACKAGE_ARCH}', '${DEFAULT_PACKAGE_ARCH}', d)}" -- cgit v1.2.3-54-g00ecf