summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2021-10-25 16:07:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-27 09:46:41 +0100
commit71d1f23204816c78ed43d071ae8856c950dac94d (patch)
treecd6f9441eb281059aa04b9f9061c4bc7364a68f6 /meta/recipes-devtools/qemu
parent2fc0ba7efadf8c2f255f71e87eba3679e4a6ec5c (diff)
downloadpoky-71d1f23204816c78ed43d071ae8856c950dac94d.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. (From OE-Core rev: 9d05227e910d3f374ba7a9763ff2584b9e40db61) 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/qemu')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc8
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"
9RDEPENDS:${PN}-ptest = "bash" 9RDEPENDS:${PN}-ptest = "bash"
10 10
11require qemu-targets.inc 11require qemu-targets.inc
12inherit pkgconfig ptest 12inherit pkgconfig ptest python3-dir
13 13
14LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 14LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
15 file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" 15 file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
@@ -111,7 +111,11 @@ do_configure:prepend:class-native() {
111} 111}
112 112
113do_configure() { 113do_configure() {
114 ${S}/configure ${EXTRA_OECONF} 114 # This is taken from meson.bbclass to avoid errors when updating to a
115 # new version of meson.
116 rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || :
117
118 ${S}/configure ${EXTRA_OECONF}
115} 119}
116do_configure[cleandirs] += "${B}" 120do_configure[cleandirs] += "${B}"
117 121