From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 27 May 2022 16:24:22 +0000 (+0100)
Subject: Revert "qemu.inc: Remove empty egg-info directories before running meson"
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~4006
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0df45346e626adfef8c6beb452b6309096da74a8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.
---

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 5f303992bed..e4ced6ac27e 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"
 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}"