1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-10 04:00:28 +00:00

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>
This commit is contained in:
Ross Burton
2022-03-08 16:32:01 +00:00
committed by Richard Purdie
parent 7f4c9a6343
commit 60fbc692fa
@@ -21,13 +21,10 @@ DEPENDS += "${PYTHON_PN}"
DEPENDS:remove:class-native = "python3-pip-native python3-setuptools-native" DEPENDS:remove:class-native = "python3-pip-native python3-setuptools-native"
DEPENDS:append:class-native = " unzip-native" DEPENDS:append:class-native = " unzip-native"
PYPA_WHEEL ?= "${B}/dist/${PYPI_PACKAGE}-${PV}-*.whl"
do_install:class-native() { do_install:class-native() {
# Bootstrap to prevent dependency loop in python3-pip-native # Bootstrap to prevent dependency loop in python3-pip-native
install -d ${D}${PYTHON_SITEPACKAGES_DIR} install -d ${D}${PYTHON_SITEPACKAGES_DIR}
unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PYPA_WHEEL} || \ unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PIP_INSTALL_DIST_PATH}/*.whl
bbfatal_log "Failed to unzip wheel: ${PYPA_WHEEL}. Check the logs."
} }
RDEPENDS:${PN} = "\ RDEPENDS:${PN} = "\