diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-19 16:07:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-20 11:39:45 +0000 |
commit | 0b33104a973c9dee0a33254197e487e7fc6156b7 (patch) | |
tree | 7d3e938fcd8f6263a37a131df6ccde551db84471 /meta/classes-recipe | |
parent | 4cfd0f7e4e2db19344677999572e5b71ae97dfc4 (diff) | |
download | poky-0b33104a973c9dee0a33254197e487e7fc6156b7.tar.gz |
python: Drop ${PYTHON_PN}
python 2 is gone and we don't need the abstraction now, drop the remaining usage
of this variable.
The definition in python3-dir.bbclass is left for now for other layers.
(From OE-Core rev: b566b1e32c7993d1ab7795562f648e52ce186a70)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r-- | meta/classes-recipe/setuptools3-base.bbclass | 6 | ||||
-rw-r--r-- | meta/classes-recipe/setuptools3.bbclass | 4 | ||||
-rw-r--r-- | meta/classes-recipe/setuptools3_legacy.bbclass | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes-recipe/setuptools3-base.bbclass b/meta/classes-recipe/setuptools3-base.bbclass index d1c1fa095f..27af6abc58 100644 --- a/meta/classes-recipe/setuptools3-base.bbclass +++ b/meta/classes-recipe/setuptools3-base.bbclass | |||
@@ -4,9 +4,9 @@ | |||
4 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
5 | # | 5 | # |
6 | 6 | ||
7 | DEPENDS:append:class-target = " ${PYTHON_PN}-native ${PYTHON_PN}" | 7 | DEPENDS:append:class-target = " python3-native python3" |
8 | DEPENDS:append:class-nativesdk = " ${PYTHON_PN}-native ${PYTHON_PN}" | 8 | DEPENDS:append:class-nativesdk = " python3-native python3" |
9 | RDEPENDS:${PN}:append:class-target = " ${PYTHON_PN}-core" | 9 | RDEPENDS:${PN}:append:class-target = " python3-core" |
10 | 10 | ||
11 | export STAGING_INCDIR | 11 | export STAGING_INCDIR |
12 | export STAGING_LIBDIR | 12 | export STAGING_LIBDIR |
diff --git a/meta/classes-recipe/setuptools3.bbclass b/meta/classes-recipe/setuptools3.bbclass index 4c6e79ee9a..d71a089539 100644 --- a/meta/classes-recipe/setuptools3.bbclass +++ b/meta/classes-recipe/setuptools3.bbclass | |||
@@ -21,9 +21,9 @@ setuptools3_do_compile() { | |||
21 | NO_FETCH_BUILD=1 \ | 21 | NO_FETCH_BUILD=1 \ |
22 | STAGING_INCDIR=${STAGING_INCDIR} \ | 22 | STAGING_INCDIR=${STAGING_INCDIR} \ |
23 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 23 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
24 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ | 24 | ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ |
25 | bdist_wheel --verbose --dist-dir ${PEP517_WHEEL_PATH} ${SETUPTOOLS_BUILD_ARGS} || \ | 25 | bdist_wheel --verbose --dist-dir ${PEP517_WHEEL_PATH} ${SETUPTOOLS_BUILD_ARGS} || \ |
26 | bbfatal_log "'${PYTHON_PN} setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed." | 26 | bbfatal_log "'python3 setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed." |
27 | } | 27 | } |
28 | setuptools3_do_compile[vardepsexclude] = "MACHINE" | 28 | setuptools3_do_compile[vardepsexclude] = "MACHINE" |
29 | do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" | 29 | do_compile[cleandirs] += "${PEP517_WHEEL_PATH}" |
diff --git a/meta/classes-recipe/setuptools3_legacy.bbclass b/meta/classes-recipe/setuptools3_legacy.bbclass index 57de956d0a..264b1f5cfb 100644 --- a/meta/classes-recipe/setuptools3_legacy.bbclass +++ b/meta/classes-recipe/setuptools3_legacy.bbclass | |||
@@ -38,9 +38,9 @@ setuptools3_legacy_do_compile() { | |||
38 | NO_FETCH_BUILD=1 \ | 38 | NO_FETCH_BUILD=1 \ |
39 | STAGING_INCDIR=${STAGING_INCDIR} \ | 39 | STAGING_INCDIR=${STAGING_INCDIR} \ |
40 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 40 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
41 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ | 41 | ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ |
42 | build --build-base=${B} ${SETUPTOOLS_BUILD_ARGS} || \ | 42 | build --build-base=${B} ${SETUPTOOLS_BUILD_ARGS} || \ |
43 | bbfatal_log "'${PYTHON_PN} setup.py build ${SETUPTOOLS_BUILD_ARGS}' execution failed." | 43 | bbfatal_log "'python3 setup.py build ${SETUPTOOLS_BUILD_ARGS}' execution failed." |
44 | } | 44 | } |
45 | setuptools3_legacy_do_compile[vardepsexclude] = "MACHINE" | 45 | setuptools3_legacy_do_compile[vardepsexclude] = "MACHINE" |
46 | 46 | ||
@@ -50,9 +50,9 @@ setuptools3_legacy_do_install() { | |||
50 | STAGING_INCDIR=${STAGING_INCDIR} \ | 50 | STAGING_INCDIR=${STAGING_INCDIR} \ |
51 | STAGING_LIBDIR=${STAGING_LIBDIR} \ | 51 | STAGING_LIBDIR=${STAGING_LIBDIR} \ |
52 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR}:$PYTHONPATH \ | 52 | PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR}:$PYTHONPATH \ |
53 | ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \ | 53 | ${STAGING_BINDIR_NATIVE}/python3-native/python3 setup.py \ |
54 | build --build-base=${B} install --skip-build ${SETUPTOOLS_INSTALL_ARGS} || \ | 54 | build --build-base=${B} install --skip-build ${SETUPTOOLS_INSTALL_ARGS} || \ |
55 | bbfatal_log "'${PYTHON_PN} setup.py install ${SETUPTOOLS_INSTALL_ARGS}' execution failed." | 55 | bbfatal_log "'python3 setup.py install ${SETUPTOOLS_INSTALL_ARGS}' execution failed." |
56 | 56 | ||
57 | # support filenames with *spaces* | 57 | # support filenames with *spaces* |
58 | find ${D} -name "*.py" -exec grep -q ${D} {} \; \ | 58 | find ${D} -name "*.py" -exec grep -q ${D} {} \; \ |