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. Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-devtools/python/python3-pip_22.0.3.bb | 5 +---- 1 file changed, 1 insertion(+), 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" SRC_URI[sha256sum] = "f29d589df8c8ab99c060e68ad294c4a9ed896624f6368c5349d70aa581b333d0" -PYPA_WHEEL ?= "${B}/dist/${PYPI_PACKAGE}-${PV}-*.whl" - do_install:class-native() { # Bootstrap to prevent dependency loop in python3-pip-native install -d ${D}${PYTHON_SITEPACKAGES_DIR} - unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PYPA_WHEEL} || \ - bbfatal_log "Failed to unzip wheel: ${PYPA_WHEEL}. Check the logs." + unzip -d ${D}${PYTHON_SITEPACKAGES_DIR} ${PIP_INSTALL_DIST_PATH}/*.whl # pip install would normally generate [console_scripts] in ${bindir} install -d ${D}/${bindir} -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#162937): https://lists.openembedded.org/g/openembedded-core/message/162937 Mute This Topic: https://lists.openembedded.org/mt/89641203/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
