From 3cbe3e6f932151800793854ad5d3569dc6f36ab1 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 25 Oct 2021 16:07:14 +0200 Subject: [PATCH] qemu.inc: Remove empty egg-info directories before running meson This is the same solution that has been applied to meson.bbclass to allow building with meson after it has been updated to a new version. It needs to be applied here as well since qemu uses meson without inheriting meson.bbclass. Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 9d05227e910d3f374ba7a9763ff2584b9e40db61) Signed-off-by: Anuj Mittal --- meta/recipes-devtools/qemu/qemu.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4c94060222..d51a1b0007 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -9,7 +9,7 @@ LICENSE = "GPLv2 & LGPLv2.1" RDEPENDS:${PN}-ptest = "bash" require qemu-targets.inc -inherit pkgconfig ptest +inherit pkgconfig ptest python3-dir LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" @@ -122,7 +122,11 @@ do_configure:prepend:class-native() { } do_configure() { - ${S}/configure ${EXTRA_OECONF} + # This is taken from meson.bbclass to avoid errors when updating to a + # new version of meson. + rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || : + + ${S}/configure ${EXTRA_OECONF} } do_configure[cleandirs] += "${B}" -- 2.40.1