diff options
author | Ross Burton <ross.burton@arm.com> | 2024-03-15 14:37:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-22 16:24:21 +0000 |
commit | 0142da4768b7818b94601a89bf867e10a0ba0ec0 (patch) | |
tree | 1ec5c038bbb58633c68fdaf07cfb539847959695 | |
parent | 9d6923da5564d45bbf80fd722184e87b4a2be867 (diff) | |
download | openembedded-core-0142da4768b7818b94601a89bf867e10a0ba0ec0.tar.gz |
python3_pip517: just count wheels in the directory, not subdirectories
The install task uses a recursive find to check that it can only find
one wheel, but then does a non-recursive glob to install. This can
lead to false-failures if PEP517_WHEEL_PATH points at a directory with
subdirectories.
Solve this mismatch by making the find non-recusive.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/python_pep517.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/python_pep517.bbclass b/meta/classes-recipe/python_pep517.bbclass index a1659c5f62..c30674c8ec 100644 --- a/meta/classes-recipe/python_pep517.bbclass +++ b/meta/classes-recipe/python_pep517.bbclass @@ -42,7 +42,7 @@ python_pep517_do_compile () { do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" python_pep517_do_install () { - COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' | wc -l) + COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' -maxdepth 1 | wc -l) if test $COUNT -eq 0; then bbfatal No wheels found in ${PEP517_WHEEL_PATH} elif test $COUNT -gt 1; then |