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:27:48 +0000 |
commit | 0291c2c1314d0691a1960d5e991c67c7a00304d1 (patch) | |
tree | 2c067464c79b573adf6e3967497b60cc8598f136 /meta/classes-recipe | |
parent | 825055e83ea6ec0a9328ea4d53de6516dfb9a795 (diff) | |
download | poky-0291c2c1314d0691a1960d5e991c67c7a00304d1.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.
(From OE-Core rev: 0142da4768b7818b94601a89bf867e10a0ba0ec0)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-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 () { | |||
42 | do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" | 42 | do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" |
43 | 43 | ||
44 | python_pep517_do_install () { | 44 | python_pep517_do_install () { |
45 | COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' | wc -l) | 45 | COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' -maxdepth 1 | wc -l) |
46 | if test $COUNT -eq 0; then | 46 | if test $COUNT -eq 0; then |
47 | bbfatal No wheels found in ${PEP517_WHEEL_PATH} | 47 | bbfatal No wheels found in ${PEP517_WHEEL_PATH} |
48 | elif test $COUNT -gt 1; then | 48 | elif test $COUNT -gt 1; then |