diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-10-25 16:07:14 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-27 09:44:59 +0100 |
| commit | 9d05227e910d3f374ba7a9763ff2584b9e40db61 (patch) | |
| tree | 2c0547da35bacf1274a4053571fcb7fec1701a3d /meta/recipes-devtools | |
| parent | 47d9d90b4ec7d04d6f3f1a9b97c0ab7f1264a88e (diff) | |
| download | openembedded-core-9d05227e910d3f374ba7a9763ff2584b9e40db61.tar.gz | |
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 <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 57e5e1a015..33052a9d49 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" @@ -111,7 +111,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}" |