]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
Revert "qemu.inc: Remove empty egg-info directories before running meson"
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 27 May 2022 16:24:22 +0000 (17:24 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 28 May 2022 17:37:01 +0000 (18:37 +0100)
This reverts commit 9d05227e910d3f374ba7a9763ff2584b9e40db61.

This is no longer needed with a patch to importlib in python.

meta/recipes-devtools/qemu/qemu.inc

index 5f303992bed8ff0b689e3c84acaa2f1cf3e511a5..e4ced6ac27e67d51a0d66a68e9cbca49024c87c4 100644 (file)
@@ -9,7 +9,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 RDEPENDS:${PN}-ptest = "bash"
 
 require qemu-targets.inc
-inherit pkgconfig ptest python3-dir
+inherit pkgconfig ptest
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
@@ -111,11 +111,7 @@ do_configure:prepend:class-native() {
 }
 
 do_configure() {
-       # 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}
+    ${S}/configure ${EXTRA_OECONF}
 }
 do_configure[cleandirs] += "${B}"