summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended
diff options
context:
space:
mode:
authorTim Orling <ticotimo@gmail.com>2024-02-19 20:10:25 -0800
committerKhem Raj <raj.khem@gmail.com>2024-02-19 23:22:24 -0800
commit1e1458f98eefd57cdf94877308aed6a68a8e7def (patch)
treec62f2c9a5a57f74a15cf4c72d5d3e9fdd76daa82 /meta-oe/recipes-extended
parent94c20e1ef4d7bd1dde1003cde25b9adb1ccc8310 (diff)
downloadmeta-openembedded-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-extended')
-rw-r--r--meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb6
-rw-r--r--meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb2
-rw-r--r--meta-oe/recipes-extended/mraa/mraa_git.bb10
-rw-r--r--meta-oe/recipes-extended/upm/upm_git.bb10
4 files changed, 14 insertions, 14 deletions
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb
index 0c981ebf5..5f2993dd4 100644
--- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb
+++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb
@@ -25,11 +25,11 @@ do_install () {
25 oe_runmake install 25 oe_runmake install
26} 26}
27 27
28PACKAGES += "${PYTHON_PN}-${BPN}" 28PACKAGES += "python3-${BPN}"
29 29
30RPROVIDES:${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" 30RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg"
31 31
32FILES:${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" 32FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
33 33
34SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831" 34SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831"
35 35
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
index 4454496f6..f08fea7de 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
@@ -26,7 +26,7 @@ export BUILD_SYS
26export HOST_SYS 26export HOST_SYS
27 27
28EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ 28EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \
29 --with-python-binary=${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} \ 29 --with-python-binary=${STAGING_BINDIR_NATIVE}/python3-native/python3 \
30 --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \ 30 --with-pythonsitedir=${PYTHON_SITEPACKAGES_DIR} \
31 --libdir=${libdir} \ 31 --libdir=${libdir} \
32 --with-securedir=${base_libdir}/security \ 32 --with-securedir=${base_libdir}/security \
diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb
index 37bd36432..4d3baf6ca 100644
--- a/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -48,20 +48,20 @@ BINDINGS:armv4 ??= "python"
48BINDINGS:armv5 ??= "python" 48BINDINGS:armv5 ??= "python"
49 49
50PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ 50PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
51 ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" 51 ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
52 52
53PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," 53PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native python3,"
54PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," 54PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
55PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222" 55PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222"
56 56
57FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" 57FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/"
58RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" 58RDEPENDS:python3-${PN} += "python3"
59 59
60FILES:node-${PN} = "${prefix}/lib/node_modules/" 60FILES:node-${PN} = "${prefix}/lib/node_modules/"
61RDEPENDS:node-${PN} += "nodejs" 61RDEPENDS:node-${PN} += "nodejs"
62 62
63### Include desired language bindings ### 63### Include desired language bindings ###
64PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" 64PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"
65PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" 65PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}"
66 66
67TOOLCHAIN = "gcc" 67TOOLCHAIN = "gcc"
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 8468ff775..3aa766d0b 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -42,21 +42,21 @@ BINDINGS:armv4 ??= "python"
42BINDINGS:armv5 ??= "python" 42BINDINGS:armv5 ??= "python"
43 43
44PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ 44PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
45 ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}" 45 ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
46 46
47PACKAGECONFIG[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}," 47PACKAGECONFIG[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,"
48PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," 48PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native,"
49 49
50do_configure:prepend() { 50do_configure:prepend() {
51 sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake 51 sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake
52} 52}
53 53
54FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" 54FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
55RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" 55RDEPENDS:python3-${PN} += "python3"
56 56
57FILES:node-${PN} = "${prefix}/lib/node_modules/" 57FILES:node-${PN} = "${prefix}/lib/node_modules/"
58RDEPENDS:node-${PN} += "nodejs" 58RDEPENDS:node-${PN} += "nodejs"
59 59
60### Include desired language bindings ### 60### Include desired language bindings ###
61PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" 61PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}"
62PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" 62PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}"