diff options
author | Ross Burton <ross@burtonini.com> | 2022-03-08 16:32:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-09 11:46:28 +0000 |
commit | 60fbc692fae12b49daaa996e2d58504c59f1ddce (patch) | |
tree | 549a1cba5a7d17834e6d4f6b3658867f6c8946f8 | |
parent | 7f4c9a63431adc1987552c1a25c37d0fc2f3f600 (diff) | |
download | poky-60fbc692fae12b49daaa996e2d58504c59f1ddce.tar.gz |
python3-setuptools3: 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: c0a24279c740555a06a5c57e2a01ca7b20f8e668)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_59.5.0.bb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb b/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb index 2155101d30..9d2c2fd744 100644 --- a/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb | |||
@@ -21,13 +21,10 @@ DEPENDS += "${PYTHON_PN}" | |||
21 | DEPENDS:remove:class-native = "python3-pip-native python3-setuptools-native" | 21 | DEPENDS:remove:class-native = "python3-pip-native python3-setuptools-native" |
22 | DEPENDS:append:class-native = " unzip-native" | 22 | DEPENDS:append:class-native = " unzip-native" |
23 | 23 | ||
24 | PYPA_WHEEL ?= "${B}/dist/${PYPI_PACKAGE}-${PV}-*.whl" | ||
25 | |||
26 | do_install:class-native() { | 24 | do_install:class-native() { |
27 | # Bootstrap to prevent dependency loop in python3-pip-native | 25 | # Bootstrap to prevent dependency loop in python3-pip-native |
28 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} | 26 | install -d ${D}${PYTHON_SITEPACKAGES_DIR} |
29 | unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PYPA_WHEEL} || \ | 27 | unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PIP_INSTALL_DIST_PATH}/*.whl |
30 | bbfatal_log "Failed to unzip wheel: ${PYPA_WHEEL}. Check the logs." | ||
31 | } | 28 | } |
32 | 29 | ||
33 | RDEPENDS:${PN} = "\ | 30 | RDEPENDS:${PN} = "\ |