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-extended | |
parent | 94c20e1ef4d7bd1dde1003cde25b9adb1ccc8310 (diff) | |
download | meta-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.bb | 6 | ||||
-rw-r--r-- | meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-extended/mraa/mraa_git.bb | 10 | ||||
-rw-r--r-- | meta-oe/recipes-extended/upm/upm_git.bb | 10 |
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 | ||
28 | PACKAGES += "${PYTHON_PN}-${BPN}" | 28 | PACKAGES += "python3-${BPN}" |
29 | 29 | ||
30 | RPROVIDES:${BPN}-dbg += "${PYTHON_PN}-${BPN}-dbg" | 30 | RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg" |
31 | 31 | ||
32 | FILES:${PYTHON_PN}-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" | 32 | FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" |
33 | 33 | ||
34 | SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831" | 34 | SRCREV = "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 | |||
26 | export HOST_SYS | 26 | export HOST_SYS |
27 | 27 | ||
28 | EXTRA_OECONF += "--with-python-rev=${PYTHON_BASEVERSION} \ | 28 | EXTRA_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" | |||
48 | BINDINGS:armv5 ??= "python" | 48 | BINDINGS:armv5 ??= "python" |
49 | 49 | ||
50 | PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ | 50 | PACKAGECONFIG ??= "${@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 | ||
53 | PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," | 53 | PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON, -DBUILDSWIGPYTHON=OFF, swig-native python3," |
54 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," | 54 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," |
55 | PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222" | 55 | PACKAGECONFIG[ft4222] = "-DUSBPLAT=ON -DFTDI4222=ON, -DUSBPLAT=OFF -DFTDI4222=OFF,, libft4222" |
56 | 56 | ||
57 | FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" | 57 | FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}/" |
58 | RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" | 58 | RDEPENDS:python3-${PN} += "python3" |
59 | 59 | ||
60 | FILES:node-${PN} = "${prefix}/lib/node_modules/" | 60 | FILES:node-${PN} = "${prefix}/lib/node_modules/" |
61 | RDEPENDS:node-${PN} += "nodejs" | 61 | RDEPENDS:node-${PN} += "nodejs" |
62 | 62 | ||
63 | ### Include desired language bindings ### | 63 | ### Include desired language bindings ### |
64 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" | 64 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" |
65 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" | 65 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}" |
66 | 66 | ||
67 | TOOLCHAIN = "gcc" | 67 | TOOLCHAIN = "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" | |||
42 | BINDINGS:armv5 ??= "python" | 42 | BINDINGS:armv5 ??= "python" |
43 | 43 | ||
44 | PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \ | 44 | PACKAGECONFIG ??= "${@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 | ||
47 | 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}," | 47 | 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," |
48 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," | 48 | PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," |
49 | 49 | ||
50 | do_configure:prepend() { | 50 | do_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 | ||
54 | FILES:${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" | 54 | FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" |
55 | RDEPENDS:${PYTHON_PN}-${PN} += "${PYTHON_PN}" | 55 | RDEPENDS:python3-${PN} += "python3" |
56 | 56 | ||
57 | FILES:node-${PN} = "${prefix}/lib/node_modules/" | 57 | FILES:node-${PN} = "${prefix}/lib/node_modules/" |
58 | RDEPENDS:node-${PN} += "nodejs" | 58 | RDEPENDS:node-${PN} += "nodejs" |
59 | 59 | ||
60 | ### Include desired language bindings ### | 60 | ### Include desired language bindings ### |
61 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" | 61 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'nodejs', 'node-${PN}', '', d)}" |
62 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', '${PYTHON_PN}-${PN}', '', d)}" | 62 | PACKAGES =+ "${@bb.utils.contains('BINDINGS', 'python', 'python3-${PN}', '', d)}" |