| Message ID | 20240220173209.1761469-1-akuster808@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-security] meta-security: Drop ${PYTHON_PN} | expand |
On Tue, 2024-02-20 at 12:32 -0500, Armin Kuster wrote: > + pyhton3-ctypes \ > + pyhton3-fcntl \ > + pyhton3-io \ > + pyhton3-logging \ > + pyhton3-misc \ > + pyhton3-shell \ > + pyhton3-threading \ pyhton3 -> python3 ? Thanks, Anuj
On 2/23/24 12:22 AM, Anuj Mittal wrote: > On Tue, 2024-02-20 at 12:32 -0500, Armin Kuster wrote: >> + pyhton3-ctypes \ >> + pyhton3-fcntl \ >> + pyhton3-io \ >> + pyhton3-logging \ >> + pyhton3-misc \ >> + pyhton3-shell \ >> + pyhton3-threading \ > pyhton3 -> python3 ? thanks for catching that. BR, Armin > > Thanks, > > Anuj > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#62573): https://lists.yoctoproject.org/g/yocto/message/62573 > Mute This Topic: https://lists.yoctoproject.org/mt/104471902/3616698 > Group Owner: yocto+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [akuster808@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb index 377ad02..ba0f974 100644 --- a/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb +++ b/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-script_2.0.6.bb @@ -10,5 +10,5 @@ PYPI_PACKAGE = "Flask-Script" inherit pypi setuptools3 RDEPENDS:${PN} += "\ - ${PYTHON_PN}-flask \ + python3-flask \ " diff --git a/dynamic-layers/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb b/dynamic-layers/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb index 963fcfe..9cc54f4 100644 --- a/dynamic-layers/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb +++ b/dynamic-layers/meta-python/recipes-devtools/python/python3-pyinotify_0.9.6.bb @@ -3,13 +3,13 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=ab173cade7965b411528464589a08382" RDEPENDS:${PN} += "\ - ${PYTHON_PN}-ctypes \ - ${PYTHON_PN}-fcntl \ - ${PYTHON_PN}-io \ - ${PYTHON_PN}-logging \ - ${PYTHON_PN}-misc \ - ${PYTHON_PN}-shell \ - ${PYTHON_PN}-threading \ + pyhton3-ctypes \ + pyhton3-fcntl \ + pyhton3-io \ + pyhton3-logging \ + pyhton3-misc \ + pyhton3-shell \ + pyhton3-threading \ " SRC_URI[md5sum] = "8e580fa1ff3971f94a6f81672b76c406" diff --git a/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb b/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb index 135e97c..bf5f87d 100644 --- a/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb +++ b/dynamic-layers/meta-python/recipes-security/fail2ban/python3-fail2ban_1.0.2.bb @@ -54,7 +54,7 @@ do_install:append () { do_install_ptest:append () { install -d ${D}${PTEST_PATH} install -d ${D}${PTEST_PATH}/bin - sed -i -e 's/##PYTHON##/${PYTHON_PN}/g' ${D}${PTEST_PATH}/run-ptest + sed -i -e 's/##PYTHON##/python3/g' ${D}${PTEST_PATH}/run-ptest install -D ${S}/bin/* ${D}${PTEST_PATH}/bin rm -f ${D}${PTEST_PATH}/bin/fail2ban-python } diff --git a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.9.0.bb b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.9.0.bb index e0def0f..9dea957 100644 --- a/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.9.0.bb +++ b/meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.9.0.bb @@ -24,9 +24,9 @@ do_compile:append() { do_install:append() { cd ${S}/tools export PYTHONPATH="${D}${PYTHON_SITEPACKAGES_DIR}" - ${PYTHON_PN} setup.py install --root="${D}" --prefix="${prefix}" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --optimize=1 --skip-build + python3 setup.py install --root="${D}" --prefix="${prefix}" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --optimize=1 --skip-build - sed -i -e "s:${PYTHON}:${USRBINPATH}/env ${PYTHON_PN}:g" "${D}${bindir}"/tpm2_ptool + sed -i -e "s:${PYTHON}:${USRBINPATH}/env python3:g" "${D}${bindir}"/tpm2_ptool } PACKAGES =+ "${PN}-tools" @@ -44,4 +44,4 @@ FILES:${PN} += "\ INSANE_SKIP:${PN} += "dev-so" RDEPENDS:${PN} = "p11-kit tpm2-tools " -RDEPENDS:${PN}-tools = "${PYTHON_PN}-pyyaml ${PYTHON_PN}-cryptography ${PYTHON_PN}-pyasn1-modules" +RDEPENDS:${PN}-tools = "python3-pyyaml python3-cryptography python3-pyasn1-modules" diff --git a/recipes-ids/suricata/suricata_7.0.0.bb b/recipes-ids/suricata/suricata_7.0.0.bb index a52f081..a01b3d9 100644 --- a/recipes-ids/suricata/suricata_7.0.0.bb +++ b/recipes-ids/suricata/suricata_7.0.0.bb @@ -104,9 +104,9 @@ do_install () { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run - sed -i -e "s:#!.*$:#!${USRBINPATH}/env ${PYTHON_PN}:g" ${D}${bindir}/suricatasc - sed -i -e "s:#!.*$:#!${USRBINPATH}/env ${PYTHON_PN}:g" ${D}${bindir}/suricatactl - sed -i -e "s:#!.*$:#!${USRBINPATH}/env ${PYTHON_PN}:g" ${D}${libdir}/suricata/python/suricata/sc/suricatasc.py + sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${bindir}/suricatasc + sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${bindir}/suricatactl + sed -i -e "s:#!.*$:#!${USRBINPATH}/env python3:g" ${D}${libdir}/suricata/python/suricata/sc/suricatasc.py } pkg_postinst_ontarget:${PN} () {
Signed-off-by: Armin Kuster <akuster808@gmail.com> --- .../python/python3-flask-script_2.0.6.bb | 2 +- .../python/python3-pyinotify_0.9.6.bb | 14 +++++++------- .../fail2ban/python3-fail2ban_1.0.2.bb | 2 +- .../recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.9.0.bb | 6 +++--- recipes-ids/suricata/suricata_7.0.0.bb | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-)