meta-openembedded/all: adapt to UNPACKDIR changes

Please see
https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265
for what changes are needed, and sed commands that can be used to make them en masse.

I've verified that bitbake -c patch world works with these, but did not run a world
build; the majority of recipes shouldn't need further fixups, but if there are
some that still fall out, they can be fixed in followups.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alexander Kanavin
2025-06-20 16:06:53 +02:00
committed by Khem Raj
parent 188491dd2b
commit fc78d37ff0
1054 changed files with 385 additions and 1160 deletions
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6afb13fdc220497ee5cded1e717ed67"
SRC_URI[sha256sum] = "aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"
S = "${WORKDIR}/annotated_types-${PV}"
S = "${UNPACKDIR}/annotated_types-${PV}"
PYPI_PACKAGE = "annotated_types"
UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
@@ -11,6 +11,5 @@ SRCREV ?= "c7553c79f9222e20783fe9bd8a553f932e918072"
inherit setuptools3
S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/aws/aws-iot-device-sdk-python;branch=master;protocol
file://0001-setup.py-Use-setuptools-instead-of-distutils.patch \
"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -7,7 +7,6 @@ PV .= "+git${SRCREV}"
SRCREV = "9520119376046aeff73804b5f1ea05d87a63f370"
SRC_URI += "git://github.com/behave/behave;branch=master;protocol=https"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -12,7 +12,6 @@ SRC_URI += " \
file://0001-Drop-ptests-fixtures-and-recorde_modes.patch \
"
S = "${WORKDIR}/git"
inherit setuptools3 ptest
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/ReFirmLabs/binwalk;protocol=https;branch=master"
SRCREV = "cddfede795971045d99422bd7a9676c8803ec5ee"
S = "${WORKDIR}/git"
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
@@ -4,11 +4,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bcbc2069a86cba1b5e47253679f66ed7"
SRCREV = "2e6890f68f6718b4f92e602b9b926aa3d107b556"
PYPI_SRC_URI = "git://github.com/hbldh/bleak.git;protocol=https;branch=develop"
PYPI_SRC_URI = "git://github.com/hbldh/bleak.git;protocol=https;branch=develop;destsuffix=${S}"
inherit pypi python_poetry_core ptest-python-pytest
S = "${WORKDIR}/git"
RDEPENDS:${PN}-ptest += " \
python3-pytest-asyncio \
@@ -11,7 +11,6 @@ SRC_URI += " \
SRCREV = "007f5aff5d1c817883385a5f61f742dd11776dc6"
S = "${WORKDIR}/git"
inherit setuptools3 ptest
@@ -6,6 +6,5 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2"
SRC_URI = "git://github.com/fedora-python/crypt_r.git;branch=main;protocol=https"
SRCREV = "b20e21d9f24d6fa17a6781bbc9f272ce38246eef"
S = "${UNPACKDIR}/git"
inherit python_setuptools_build_meta
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/cvxopt/cvxopt;protocol=https;branch=master"
SRCREV = "3b718ee560b3b97d6255c55f0ed7f64cb4b72082"
S = "${WORKDIR}/git"
RDEPENDS:${PN} += "lapack suitesparse"
DEPENDS += "lapack suitesparse"
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/dasbus-project/dasbus.git;protocol=https;branch=mast
"
SRCREV = "413cf9a0b7c231468f1d28d9a29dd8dd8bda15c5"
S = "${WORKDIR}/git"
inherit setuptools3 ptest-python-pytest
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/ldo/dbussy.git;branch=master;protocol=https \
SRCREV = "37ede4242b48def73ada46c2747a4c5cae6abf45"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c"
SRC_URI[sha256sum] = "17f515970b04ed7900b733c95fd8091f4f85e52f1fb5f268757f25c858eb1f7b"
S = "${WORKDIR}/dirty_equals-${PV}"
S = "${UNPACKDIR}/dirty_equals-${PV}"
inherit pypi python_hatchling
@@ -10,7 +10,6 @@ SRC_URI = " \
"
SRCREV = "fe536afac4da31e86909191ef31708755ab8cf83"
S = "${WORKDIR}/git"
inherit python_hatchling
@@ -18,4 +18,4 @@ SRC_URI += "file://0001-Fix-host-contamination-of-include-files.patch \
inherit pkgconfig pypi python_setuptools_build_meta
# it's lowercase pyicu instead of ${PYPI_PACKAGE} in this version
S = "${WORKDIR}/pyicu-${PV}"
S = "${UNPACKDIR}/pyicu-${PV}"
@@ -10,7 +10,7 @@ UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}"
SRC_URI[sha256sum] = "d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000"
S = "${WORKDIR}/importlib_metadata-${PV}"
S = "${UNPACKDIR}/importlib_metadata-${PV}"
DEPENDS += "python3-setuptools-scm-native"
RDEPENDS:${PN} += "python3-zipp"
@@ -12,7 +12,6 @@ SRC_URI = " \
SRCREV = "9be6a51d1660991562eefaaddefa757ca0e0e00f"
S = "${WORKDIR}/git"
inherit setuptools3 ptest-python-pytest
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/explodinglabs/jsonrpcclient.git;branch=main;protocol
inherit python_setuptools_build_meta
S = "${WORKDIR}/git"
RDEPENDS:${PN} += "\
python3-json \
@@ -9,7 +9,6 @@ SRCREV ?= "3b180cb10eda683dda7913ecee2e6487288d292d"
inherit setuptools3
S = "${WORKDIR}/git"
BBCLASSEXTEND = "native"
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/kivy/kivy.git;protocol=https;branch=stable \
SRCREV = "20d74dcd30f143abbd1aa94c76bafc5bd934d5bd"
S = "${WORKDIR}/git"
PACKAGES += "${PN}-examples"
FILES:${PN}-examples = "/usr/share/kivy-examples"
@@ -13,7 +13,6 @@ SRC_URI = " \
SRCREV = "abcf929efb748c7846dd59007cbb807e108db311"
PV .= "+git"
S = "${WORKDIR}/git"
PEP517_SOURCE_PATH = "${S}/api/python"
export LIEF_BUILD_DIR = "${B}"
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6855782848d572347212f667a2d637"
SRC_URI = "git://git.kernel.org/pub/scm/libs/python/python-linux-procfs/python-linux-procfs.git;branch=main"
SRCREV = "59ecd1ba018141a02ffe59c16a9346991dfd0d48"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -18,6 +18,6 @@ RDEPENDS:${PN} = " \
inherit setuptools3
S = "${WORKDIR}/lrparsing-${PV}"
S = "${UNPACKDIR}/lrparsing-${PV}"
BBCLASSEXTEND = "native"
@@ -8,6 +8,5 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314"
SRCREV = "80681f6604e136e513550342f977edb98f5fc5ad"
SRC_URI = "git://github.com/atdt/monotonic.git;branch=master;protocol=https"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -7,7 +7,7 @@ inherit pypi setuptools3
SRC_URI[sha256sum] = "988f264c330a17d63219c49dd2365bdaff97156be3ab6c5eaa204b45dca621e8"
S = "${WORKDIR}/moteus-${PV}"
S = "${UNPACKDIR}/moteus-${PV}"
RDEPENDS:${PN} += "\
python3-can \
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "12d6e7511d4137555a3f6ea167ae846af2c7357b10bc6fa4f7c3968fc1
PYPI_SRC_URI = "https://files.pythonhosted.org/packages/39/15/0a6214e76d4d32e7f663b109cf71fb22561c2be0f701d67f93950cd40542/paho_mqtt-${PV}.tar.gz"
S = "${WORKDIR}/paho_mqtt-${PV}"
S = "${UNPACKDIR}/paho_mqtt-${PV}"
DEPENDS += "python3-pytest-runner-native"
@@ -60,7 +60,6 @@ RDEPENDS:${PN}-ptest += " \
CVE_PRODUCT = "pillow"
S = "${WORKDIR}/git"
RPROVIDES:${PN} += "python3-imaging"
@@ -7,7 +7,6 @@ SECTION = "devel/python"
LICENSE = "GPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=1475481f9ec754d758859bd2c75f6f6f"
S = "${WORKDIR}/git"
B = "${S}"
SRCREV = "5e12e398eb5c4e30d7b29b02458c76d2cc780700"
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347
inherit pypi python_flit_core ptest-python-pytest
S = "${WORKDIR}/${SRCNAME}-${PV}"
S = "${UNPACKDIR}/${SRCNAME}-${PV}"
RDEPENDS:${PN} = "\
python3-core \
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/M0r13n/pyais;protocol=https;branch=master"
PV .= "+git"
SRCREV = "e7780f743b03c5e6ecc651fdeb209fa94e0e0250"
S = "${WORKDIR}/git"
inherit python_setuptools_build_meta ptest-python-pytest
@@ -10,7 +10,6 @@ DEPENDS = "python3-dbus-native glib-2.0 dbus-glib libxml2 atk gtk+ python3-pygob
SRC_URI = "git://github.com/GNOME/pyatspi2.git;protocol=https;branch=master"
SRCREV = "8c69016b38d0e4caaf4c986938ea3410fb7351b6"
S = "${WORKDIR}/git"
# Same restriction as gtk+
inherit features_check setuptools3
@@ -9,6 +9,5 @@ SRC_URI = "git://github.com/pybind/pybind11_json;branch=master;protocol=https \
DEPENDS += "nlohmann-json python3-pybind11"
EXTRA_OECMAKE += "-DPYBIND11_USE_CROSSCOMPILING=ON"
S = "${WORKDIR}/git"
inherit cmake python3native python3targetconfig
@@ -12,7 +12,6 @@ SRC_URI = "\
git://github.com/pybind/pybind11.git;branch=stable;protocol=https \
"
S = "${WORKDIR}/git"
inherit cmake python_setuptools_build_meta
@@ -15,7 +15,6 @@ SRCREV = "bce81efdeac1cbefd0196b478a32aa2586bd595a"
PV .= "+git"
SRC_URI = "git://github.com/pydantic/pydantic;protocol=https;branch=main"
S = "${WORKDIR}/git"
DEPENDS += "python3-hatch-fancy-pypi-readme-native"
@@ -14,7 +14,6 @@ SRC_URI = " \
inherit ptest setuptools3
S = "${WORKDIR}/git"
RDEPENDS:${PN} = "python3-pygobject \
python3-io \
@@ -10,7 +10,6 @@ inherit python_setuptools_build_meta
SRC_URI = "git:///github.com/russhousley/pyhsslms.git;branch=master;protocol=https"
SRCREV = "c798728deed6d3f681c9e6bfd7fe8a6705f5638b"
S = "${WORKDIR}/git"
RDEPENDS:${PN} += " \
python3-core \
@@ -12,7 +12,6 @@ SRC_URI += "git://github.com/pylint-dev/pylint;branch=maintenance/3.3.x;protocol
inherit python_setuptools_build_meta ptest
S = "${WORKDIR}/git"
RDEPENDS:${PN} += "\
python3-astroid \
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d503272f52c35147ec960cb56a03bf4"
SRC_URI = "git://github.com/Danielhiversen/pyMetno.git;protocol=https;branch=master"
SRCREV = "921812ddad3f147489916c3c7ab7fb7a80d8c646"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -20,7 +20,6 @@ SRCREV = "57db64c9f65ced05c71b8d786c1cedfaa2991597"
SRC_URI:append:mips = " file://0001-check-for-mips-targets-for-stat.st_dev-definitions.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/libsystemd-0.5.0/"
S = "${WORKDIR}/git"
inherit python_setuptools3_rust cargo-update-recipe-crates
@@ -9,7 +9,6 @@ SRC_URI = " \
git://github.com/tanbro/pyyaml-include;protocol=https;branch=main \
"
S = "${WORKDIR}/git"
inherit python_setuptools_build_meta ptest-python-pytest
@@ -7,6 +7,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
SRC_URI = "git://git.kernel.org/pub/scm/libs/python/python-schedutils/python-schedutils.git;branch=main"
SRCREV = "46469f425f9844f355f6496785ee1ce993b58747"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -20,7 +20,7 @@ SRC_URI = "https://github.com/nphilipp/${SRCNAME}/releases/download/${SRCNAME}-$
"
SRC_URI[sha256sum] = "c726c086f0dd93a0ac7a0176f383a12af91b6657b78a301e3f5b25d9f8d4d10b"
S = "${WORKDIR}/${SRCNAME}-${PV}"
S = "${UNPACKDIR}/${SRCNAME}-${PV}"
do_compile:prepend() {
sed -e 's/@VERSION@/${PV}/g' ${S}/setup.py.in > ${S}/setup.py
@@ -9,7 +9,7 @@ SRC_URI[sha256sum] = "eec464e42301d93586cbeca3845ed61bff40f560670e5b35baec57301d
DEPENDS += "i2c-tools"
S = "${WORKDIR}/i2c-tools-${PV}"
S = "${UNPACKDIR}/i2c-tools-${PV}"
inherit setuptools3
@@ -4,11 +4,10 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5"
SRCREV = "a8f80172ba16fe694e37f6e07e6352ecee384c58"
PYPI_SRC_URI = "git://github.com/hukkin/tomli-w.git;protocol=https;branch=master"
PYPI_SRC_URI = "git://github.com/hukkin/tomli-w.git;protocol=https;branch=master;destsuffix=${S}"
inherit pypi python_flit_core ptest-python-pytest
S = "${WORKDIR}/git"
RDEPENDS:${PN}-ptest += " \
python3-tomli \
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/theopolis/uefi-firmware-parser;protocol=https;branch
SRCREV = "0c5fb74bcecc0e5c80625c38130fe948c2a3656e"
S = "${WORKDIR}/git"
inherit setuptools3
@@ -12,7 +12,6 @@ SRCREV = "bcc1f26b2fe8fc962f5033c3a3a773425500789a"
SRC_URI += "git://github.com/GrahamDumpleton/wrapt;protocol=https;branch=master \
"
S = "${WORKDIR}/git"
# python3-misc for 'this' module
RDEPENDS:${PN}-ptest += " \
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/python-excel/xlrd.git;branch=master;protocol=https \
"
SRCREV = "b8d573e11ec149da695d695c81a156232b89a949"
S = "${WORKDIR}/git"
inherit ptest-python-pytest setuptools3