Back in 2023 there were random failures from empty directories in the
python site-packages directory, which at the time was believed to be
specific to hatchling and so worked around in this build class[1]. This
is not the case, but changes to hatchling and upgrades would result in
rebuilds, which expose the issue if the build tree is not cleaned.
Since then fixes have been added to python3[2] and python3-build[3]
which resolve this issue at a lower level, so the workaround in this
class should be no longer needed.
[1] oe-core 3ded8b83ceb ("python_hatchling: remove empty python sysroot dirs")
[2] oe-core 73de8daa629 ("python3: backport the full fix for importlib scanning
invalid distributions")
oe-core 855d1111c3d ("python3: prefer valid dists when searching for entry
points")
[3] oe-core bd7225f5b84 ("python3-build: verify that found dependencies are
valid")
Signed-off-by: Ross Burton <[email protected]>
---
meta/classes-recipe/python_hatchling.bbclass | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/meta/classes-recipe/python_hatchling.bbclass
b/meta/classes-recipe/python_hatchling.bbclass
index 6765ddbe8ce..8ad3ac7fbbb 100644
--- a/meta/classes-recipe/python_hatchling.bbclass
+++ b/meta/classes-recipe/python_hatchling.bbclass
@@ -7,21 +7,3 @@
inherit python_pep517
DEPENDS += "python3-hatchling-native"
-
-# delete nested, empty directories from the python site-packages path. Make
-# sure that we remove the native ones for target builds as well
-hatchling_rm_emptydirs:class-target () {
- find ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/* -depth -type d
-empty -delete
- find ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/* -depth
-type d -empty -delete
-}
-
-hatchling_rm_emptydirs:class-native () {
- find ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/* -depth
-type d -empty -delete
-}
-
-# Define a default empty version of hatchling_rm_emptydirs to appease bitbake
-hatchling_rm_emptydirs () {
- :
-}
-
-do_prepare_recipe_sysroot[postfuncs] += " hatchling_rm_emptydirs"
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#245388):
https://lists.openembedded.org/g/openembedded-core/message/245388
Mute This Topic: https://lists.openembedded.org/mt/121151566/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
