From ef70f26445ca834b404943b197f9928fe7d16e5a Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 1 Jun 2023 09:56:29 -0400 Subject: python_hatchling: remove empty python sysroot dirs In some cases, empty versioned directories are being left behind in sysroots from previous versions of packages. This appears to be found with recipes relying on hatchling, and causes errors at the do_compile step: | File "/workspace/yocto/manual/openembedded-core/build/tmp-glibc/work/core2-64-oe-linux/python3-iniconfig/2.0.0-r0/recipe-sysroot-native/usr/lib/python3.11/site-packages/packaging/version.py", line 197, in __init__ | match = self._regex.search(version) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | TypeError: expected string or bytes-like object, got 'NoneType' To fix this error, add a do_prepare_recipe_sysroot postfunc in the python_hatchling class that removes any nested empty directories from the sysroots during build, so that dependent recipes don't get caught on them. (From OE-Core rev: 3ded8b83cebb6d2b9f9da1c0325148f8da4ed23b) Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- meta/classes-recipe/python_hatchling.bbclass | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'meta/classes-recipe') diff --git a/meta/classes-recipe/python_hatchling.bbclass b/meta/classes-recipe/python_hatchling.bbclass index b9e6582eb5..b5a3c3feea 100644 --- a/meta/classes-recipe/python_hatchling.bbclass +++ b/meta/classes-recipe/python_hatchling.bbclass @@ -7,3 +7,21 @@ inherit python_pep517 python3native python3-dir setuptools3-base 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" -- cgit v1.2.3-54-g00ecf