From 94c20e1ef4d7bd1dde1003cde25b9adb1ccc8310 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Mon, 19 Feb 2024 20:10:24 -0800 Subject: meta-python: drop ${PYTHON_PN} python 2 is long unsupported, so we no longer need this variable. Signed-off-by: Tim Orling Signed-off-by: Khem Raj --- meta-python/classes/distutils3-base.bbclass | 6 +++--- meta-python/classes/distutils3.bbclass | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-python/classes') diff --git a/meta-python/classes/distutils3-base.bbclass b/meta-python/classes/distutils3-base.bbclass index 850c535bb1..4f13ea6fe7 100644 --- a/meta-python/classes/distutils3-base.bbclass +++ b/meta-python/classes/distutils3-base.bbclass @@ -1,6 +1,6 @@ -DEPENDS:append:class-target = " ${PYTHON_PN}-native ${PYTHON_PN}" -DEPENDS:append:class-nativesdk = " ${PYTHON_PN}-native ${PYTHON_PN}" -RDEPENDS:${PN} += "${@['', '${PYTHON_PN}-core']['${CLASSOVERRIDE}' == 'class-target']}" +DEPENDS:append:class-target = " python3-native python3" +DEPENDS:append:class-nativesdk = " python3-native python3" +RDEPENDS:${PN} += "${@['', 'python3-core']['${CLASSOVERRIDE}' == 'class-target']}" inherit distutils-common-base python3native python3targetconfig diff --git a/meta-python/classes/distutils3.bbclass b/meta-python/classes/distutils3.bbclass index a6d8e8763f..909415efa0 100644 --- a/meta-python/classes/distutils3.bbclass +++ b/meta-python/classes/distutils3.bbclass @@ -27,9 +27,9 @@ distutils3_do_compile() { NO_FETCH_BUILD=1 \ STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ build --build-base=${B} ${DISTUTILS_BUILD_ARGS} || \ - bbfatal_log "'${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." + bbfatal_log "'python3 setup.py build ${DISTUTILS_BUILD_ARGS}' execution failed." } distutils3_do_compile[vardepsexclude] = "MACHINE" @@ -39,9 +39,9 @@ distutils3_do_install() { STAGING_INCDIR=${STAGING_INCDIR} \ STAGING_LIBDIR=${STAGING_LIBDIR} \ PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \ - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ + ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ build --build-base=${B} install --skip-build ${DISTUTILS_INSTALL_ARGS} || \ - bbfatal_log "'${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." + bbfatal_log "'python3 setup.py install ${DISTUTILS_INSTALL_ARGS}' execution failed." # support filenames with *spaces* find ${D} -name "*.py" -exec grep -q ${D} {} \; \ -- cgit v1.2.3-54-g00ecf