Re: [OE-core][dunfell 13/19] pypi: set SRC_URI with _prepend, not with +=
From: Martin Jansa <hidden>
Date: 2021-07-06 08:31:05
Is this one worth backporting? It breaks some recipes in other layers (e.g. podman-compose in meta-virtualization http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=92f976404b7f82c97996ffce94ca2d20be2dcbda) and it's only fixing issue with devtool which imho isn't so important in dunfell compared to master. Regards, On Tue, Jul 6, 2021 at 12:36 AM Steve Sakoman [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Alexander Kanavin <redacted> This did not cause problems in builds, but broke some devtool workflows such as version upgrades or checking the latest version from upstream. Tarballs should come first, not the patches. (From OE-Core rev: 5cee50c25197102658e0689f635b2d567a375471) Signed-off-by: Alexander Kanavin <redacted> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 8f17b8bce85efb0e9a7e15d0b98a5cf7b6bd9750) Signed-off-by: Steve Sakoman <redacted> --- meta/classes/pypi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/meta/classes/pypi.bbclass b/meta/classes/pypi.bbclass index 87b4c85fc0..384a209874 100644 --- a/meta/classes/pypi.bbclass +++ b/meta/classes/pypi.bbclass@@ -19,7 +19,7 @@ PYPI_SRC_URI ?= "${@pypi_src_uri(d)}" HOMEPAGE ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/" SECTION = "devel/python" -SRC_URI += "${PYPI_SRC_URI}" +SRC_URI_prepend = "${PYPI_SRC_URI} " S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}" UPSTREAM_CHECK_URI ?= "https://pypi.org/project/${PYPI_PACKAGE}/" --2.25.1