Don't configure qemu+cmake manually, use the cmake-qemu class.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
index cf9eaf6863..0b347cf77e 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
@@ -19,7 +19,7 @@ SRCREV_FORMAT =
"vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_video
S = "${WORKDIR}/git"
-inherit pkgconfig cmake features_check python3native qemu
+inherit pkgconfig cmake cmake-qemu features_check python3native
UPSTREAM_CHECK_GITTAGREGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
@@ -42,7 +42,6 @@ SRC_URI:append:toolchain-clang = "\
"
EXTRA_OECMAKE += "-DAMBER_DISABLE_WERROR=ON \
- -DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper \
-DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner \
-DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols"
@@ -58,17 +57,6 @@ PACKAGECONFIG[x11_egl] =
"-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,su
PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless
wayland x11_egl x11_egl_glx"
PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11
virtual/egl,,,surfaceless wayland x11_egl x11_glx"
-do_configure:append() {
- # Write out a qemu wrapper that will be used by cmake
- # so that it can run target helper binaries through that.
- qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'),
[d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}"
- cat > ${WORKDIR}/qemuwrapper << EOF
-#!/bin/sh
-$qemu_binary "\$@"
-EOF
- chmod +x ${WORKDIR}/qemuwrapper
-}
-
python __anonymous() {
# if the user doesn't specify any PACKAGECONFIG then the cts build system
# is going to probe the sysroot to try to figure out what to build
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#114253):
https://lists.openembedded.org/g/openembedded-devel/message/114253
Mute This Topic: https://lists.openembedded.org/mt/110010177/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
