diff options
| author |   Tim Orling <ticotimo@gmail.com> | 2024-02-19 20:10:25 -0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2024-02-19 23:22:24 -0800 |
| commit | 1e1458f98eefd57cdf94877308aed6a68a8e7def (patch) | |
| tree | c62f2c9a5a57f74a15cf4c72d5d3e9fdd76daa82 /meta-oe/recipes-support | |
| parent | 94c20e1ef4d7bd1dde1003cde25b9adb1ccc8310 (diff) | |
| download | meta-openembedded-contrib-1e1458f98eefd57cdf94877308aed6a68a8e7def.tar.gz | |
meta-oe: drop ${PYTHON_PN}
python2 is long unsupported, so we no longer need this variable
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/libiio/libiio_0.25.bb | 12 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb | 8 | ||||
| -rw-r--r-- | meta-oe/recipes-support/pcp/pcp_6.0.5.bb | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-oe/recipes-support/libiio/libiio_0.25.bb index 3bdd445213..9f3fcc0087 100644 --- a/meta-oe/recipes-support/libiio/libiio_0.25.bb +++ b/meta-oe/recipes-support/libiio/libiio_0.25.bb @@ -43,19 +43,19 @@ PACKAGECONFIG[xml_backend] = "-DWITH_XML_BACKEND=ON,${XML_BACKEND_DISABLE},libxm PACKAGECONFIG[dnssd] = "-DHAVE_DNS_SD=ON,-DHAVE_DNS_SD=off,avahi" PACKAGECONFIG[libiio-python3] = "-DPYTHON_BINDINGS=ON,-DPYTHON_BINDINGS=OFF" -PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-${PYTHON_PN}" +PACKAGES =+ "${PN}-iiod ${PN}-tests ${PN}-python3" -# Inheriting setuptools3 incorrectly adds the dependency on ${PYTHON_PN}-core -# to ${PN} instead of to ${PN}-${PYTHON_PN} where it belongs. -RDEPENDS:${PN}:remove = "${PYTHON_PN}-core" -RDEPENDS:${PN}-${PYTHON_PN} = "${PN} ${PYTHON_PN}-core ${PYTHON_PN}-ctypes ${PYTHON_PN}-stringold" +# Inheriting setuptools3 incorrectly adds the dependency on python3-core +# to ${PN} instead of to ${PN}-python3 where it belongs. +RDEPENDS:${PN}:remove = "python3-core" +RDEPENDS:${PN}-python3 = "${PN} python3-core python3-ctypes python3-stringold" FILES:${PN}-iiod = " \ ${sbindir}/iiod \ ${systemd_system_unitdir}/iiod.service \ " FILES:${PN}-tests = "${bindir}" -FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" SYSTEMD_PACKAGES = "${PN}-iiod" SYSTEMD_SERVICE:${PN}-iiod = "iiod.service" diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb index 42b9d7e048..5969220a41 100644 --- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb +++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb @@ -21,12 +21,12 @@ PACKAGECONFIG ?= "" PACKAGECONFIG[disabledebug] = "--disable-debug,," PACKAGECONFIG[allboardconfigs] = "--with-board-configs,," PACKAGECONFIG[enableboardconfig] = "--enable-board=${BOARD},," -PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN},,${PYTHON_PN} ${PYTHON_PN}-native" +PACKAGECONFIG[python] = "--enable-python=${STAGING_BINDIR_NATIVE}/python3-native/python3,,python3 python3-native" PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', \ - '${PYTHON_PN}-libsoc-staticdev ${PYTHON_PN}-libsoc', '', d)}" + 'python3-libsoc-staticdev python3-libsoc', '', d)}" RDEPENDS:${PN} = "libgcc" -FILES:${PYTHON_PN}-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" -FILES:${PYTHON_PN}-libsoc += "${PYTHON_SITEPACKAGES_DIR}" +FILES:python3-libsoc-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*/*.a" +FILES:python3-libsoc += "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index b337df6ea4..6a93b2ec90 100644 --- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -69,7 +69,7 @@ do_compile:prepend() { ${S}/src/include/builddefs sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile export PYTHON=python3 - #export PYTHON3=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} + #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 } do_compile() { |