[PATCH v2] pypi: set SRC_URI with _prepend, not with +=

Subsystems: the rest

STALE1856d

2 messages, 2 authors, 2021-07-02 · open the first message on its own page

[PATCH v2] pypi: set SRC_URI with _prepend, not with +=

From: Alexander Kanavin <hidden>
Date: 2021-06-23 08:34:13

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.

Signed-off-by: Alexander Kanavin <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.31.1

Re: [OE-core] [PATCH v2] pypi: set SRC_URI with _prepend, not with +=

From: Martin Jansa <hidden>
Date: 2021-07-02 09:42:53

FYI this breaks podman-compose in meta-virtualization which was setting own
git:// SRC_URI after pypi inherit and now both entries end in SRC_URI and
fetch fails with:

ERROR: podman-compose-0.1.5-r0 do_fetch: No checksum specified for
'/OE/build/oe-core/downloads/podman-compose-0.1.5.tar.gz', please add at
least one to the recipe:
SRC_URI[sha256sum] =
"fb229362f188980ea3fbdee2a25d0a2dd6a0b886d925d5213e22e09f1062ebe9"
ERROR: podman-compose-0.1.5-r0 do_fetch: Fetcher failure for URL: '
https://files.pythonhosted.org/packages/source/p/podman-compose/podman-compose-0.1.5.tar.gz'.
Missing SRC_URI checksum

I'll send fix for Bruce.

On Wed, Jun 23, 2021 at 10:34 AM Alexander Kanavin [off-list ref]
wrote:
quoted hunk
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.

Signed-off-by: Alexander Kanavin <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.31.1



Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help