mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

meta-oe: drop ${PYTHON_PN}

Browse Source 
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>
This commit is contained in:
Tim Orling
2024-02-19 20:10:25 -08:00
committed by Khem Raj
parent 94c20e1ef4
commit 1e1458f98e
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb
+3 -3
View File
@@ -25,11 +25,11 @@ do_install () {
oe_runmake install
}
PACKAGES += "${PYTHON_PN}-${BPN}"
PACKAGES += "python3-${BPN}"
RPROVIDES:${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg"
RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg"
FILES:${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831"
meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
+1 -1
View File
@@ -26,7 +26,7 @@ export BUILD_SYS
export HOST_SYS
EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \
--with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \
--with-python-binary=${STAGING_BINDIR_NATIVE}/python3-native/python3 \
--with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \
--libdir=${libdir} \
--with-securedir=${base_libdir}/security \
meta-oe/recipes-extended/mraa/mraa_git.bb
+5 -5
View File
@@ -48,20 +48,20 @@ BINDINGS:armv4 ??= "python"
BINDINGS:armv5 ??= "python"
PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN},"
PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native python3,"
PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222"
FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/"
RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}"
FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/"
RDEPENDS:python3-${PN} += "python3"
FILES:node-${PN} = "${prefix}/lib/node_modules/"
RDEPENDS:node-${PN} += "nodejs"
### Include desired language bindings ###
PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"
PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}"
PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}"
TOOLCHAIN = "gcc"
meta-oe/recipes-extended/upm/upm_git.bb
+5 -5
View File
@@ -42,21 +42,21 @@ BINDINGS:armv4 ??= "python"
BINDINGS:armv5 ??= "python"
PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN},"
PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native python3,"
PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
do_configure:prepend() {
sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake
}
FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}"
FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
RDEPENDS:python3-${PN} += "python3"
FILES:node-${PN} = "${prefix}/lib/node_modules/"
RDEPENDS:node-${PN} += "nodejs"
### Include desired language bindings ###
PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"
PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}"
PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}"
meta-oe/recipes-support/libiio/libiio_0.25.bb
+6 -6
View File
@@ -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"
meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
+4 -4
View File
@@ -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}"
meta-oe/recipes-support/pcp/pcp_6.0.5.bb
+1 -1
View File
@@ -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() {