diff mbox series

[2/2] Revert "meson.bblcass: Remove empty egg-info directories before running meson"

Message ID 20220527162503.463372-2-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit ebdb49b9292bf8e61ef0a3f56ff76fcab3ac503f
Headers show
Series [1/2] Revert "qemu.inc: Remove empty egg-info directories before running meson" | expand

Commit Message

Richard Purdie May 27, 2022, 4:25 p.m. UTC 
This reverts commit 47d9d90b4ec7d04d6f3f1a9b97c0ab7f1264a88e.

This is no longer needed with a patch to fix importlib in python.
---
 meta/classes/meson.bbclass | 10 ----------
 1 file changed, 10 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 0bfe9458118..b265e6659fe 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -140,16 +140,6 @@  meson_do_configure() {
     # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
     unset LD
 
-    # sstate.bbclass no longer removes empty directories to avoid a race (see
-    # commit 4f94d929 "sstate/staging: Handle directory creation race issue").
-    # Unfortunately Python apparently treats an empty egg-info directory as if
-    # the version it previously contained still exists and fails if a newer
-    # version is required, which Meson does. To avoid this, make sure there are
-    # no empty egg-info directories from previous versions left behind. Ignore
-    # all errors from rmdir since the egg-info may be a file rather than a
-    # directory.
-    rmdir ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/*.egg-info 2>/dev/null || :
-
     # Work around "Meson fails if /tmp is mounted with noexec #2972"
     mkdir -p "${B}/meson-private/tmp"
     export TMPDIR="${B}/meson-private/tmp"