diff options
author | Ross Burton <ross@burtonini.com> | 2022-03-08 16:32:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-09 11:46:28 +0000 |
commit | 7f4c9a63431adc1987552c1a25c37d0fc2f3f600 (patch) | |
tree | 1d3d261d242f1427ae907f69ce5baf7324961e4b /meta | |
parent | ea6c0faba3b0b00916dd74d4232eb4c92a1f0ff8 (diff) | |
download | poky-7f4c9a63431adc1987552c1a25c37d0fc2f3f600.tar.gz |
python3-pip: clean up PYPA_WHEEL usage
There's no need to set PYPA_WHEEL as the default is sufficient.
Remove the use of PYPA_WHEEL in the native do_install() as this variable
will be disappearing shortly.
Remove the bbfatal_log in the native do_install(), if this breaks then
something has gone very wrong and the user is not expected to fix it.
(From OE-Core rev: b74d1c30d000c258c3f89ee125ae79ff07c25674)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python3-pip_22.0.3.bb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python3-pip_22.0.3.bb b/meta/recipes-devtools/python/python3-pip_22.0.3.bb index 8d6dfcede7..d7000b891a 100644 --- a/meta/recipes-devtools/python/python3-pip_22.0.3.bb +++ b/meta/recipes-devtools/python/python3-pip_22.0.3.bb | |||
@@ -18,13 +18,10 @@ SRC_URI += "file://reproducible.patch" | |||
18 | 18 | ||
19 | SRC_URI[sha256sum] = "f29d589df8c8ab99c060e68ad294c4a9ed896624f6368c5349d70aa581b333d0" | 19 | SRC_URI[sha256sum] = "f29d589df8c8ab99c060e68ad294c4a9ed896624f6368c5349d70aa581b333d0" |
20 | 20 | ||
21 | PYPA_WHEEL ?= "${B}/dist/${PYPI_PACKAGE}-${PV}-*.whl" | ||
22 | |||
23 | do_install:class-native() { | 21 | do_install:class-native() { |
24 | # Bootstrap to prevent dependency loop in python3-pip-native | 22 | # Bootstrap to prevent dependency loop in python3-pip-native |
25 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 23 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
26 | unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PYPA_WHEEL} || \ | 24 | unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PIP_INSTALL_DIST_PATH}/*.whl |
27 | bbfatal_log "Failed to unzip wheel: ${PYPA_WHEEL}. Check the logs." | ||
28 | 25 | ||
29 | # pip install would normally generate [console_scripts] in ${bindir} | 26 | # pip install would normally generate [console_scripts] in ${bindir} |
30 | install -d ${D}/${bindir} | 27 | install -d ${D}/${bindir} |