summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-27 17:24:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-28 18:38:02 +0100
commit09cd7bddb49947318ab2d40a373be6a3fadda1d4 (patch)
treebfc6dd132500ef4b4cfc0be44c949bf628ed971b
parent012f2db86b96b35eaaefe7f9d33dd820e3a520ec (diff)
downloadpoky-09cd7bddb49947318ab2d40a373be6a3fadda1d4.tar.gz
Revert "qemu.inc: Remove empty egg-info directories before running meson"
This reverts commit 9d05227e910d3f374ba7a9763ff2584b9e40db61. This is no longer needed with a patch to importlib in python. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 5f303992be..e4ced6ac27 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
9RDEPENDS:${PN}-ptest = "bash" 9RDEPENDS:${PN}-ptest = "bash"
10 10
11require qemu-targets.inc 11require qemu-targets.inc
12inherit pkgconfig ptest python3-dir 12inherit pkgconfig ptest
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,11 +111,7 @@ do_configure:prepend:class-native() {
111} 111}
112 112
113do_configure() { 113do_configure() {
114 # This is taken from meson.bbclass to avoid errors when updating to a 114 ${S}/configure ${EXTRA_OECONF}
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}
119} 115}
120do_configure[cleandirs] += "${B}" 116do_configure[cleandirs] += "${B}"
121 117