From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by mx.groups.io with SMTP id smtpd.web11.3495.1625560265167559718 for ; Tue, 06 Jul 2021 01:31:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=QNEf7vbB; spf=pass (domain: gmail.com, ip: 209.85.218.43, mailfrom: martin.jansa@gmail.com) Received: by mail-ej1-f43.google.com with SMTP id o5so32901936ejy.7 for ; Tue, 06 Jul 2021 01:31:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ZzmfoFfe9sWmLKMHbd1rkN/mPTRI9pNDVX+15Qf1GX8=; b=QNEf7vbBzqHbPuZWfD0IK4zMh3/IsTOJ+M1IOhd/UbADz3UV2c69fs16M8aIUjiFBv Ds6dgPsUrg02EgvpsRrb7g8stC5k9uo47IJgogX4AUDRIEiGo0FCToMOwUnrAT1lb3ZG i5FRHVd7Jnk20Xt5IiOhyPcwNvFsJwlDy9BiJ4jCmBfq/fXY8HNGkSAjf0O3SkQwsrw7 IHgAtXxmF6hVY39mjJXCl+yDk2oEXePE5J2ipt07YE6kAk/tS18+KVGKASghShcFQ7qU cqNCnXBZCv3eT7EqMY46AiQkLRLT7PDK9xCCJbVYv8euX/WWUct+7LIOSvvtPjJghdFv 6IDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ZzmfoFfe9sWmLKMHbd1rkN/mPTRI9pNDVX+15Qf1GX8=; b=IPy+WR3SWNnpGLKgMGXLcxhJwymb4KT5GjpOKCnNaVHl135QDE8XHzO7RcOqofu1tB IuccC5HuKAczjUmb17kXV4x7xAkkIKmjHW8bi4hHmwnu5HtFt6fi2gFDCB284KVn/ySJ sRj6SvDIbWdKy6xnAA6vTAxCongc4sC4cfguyLhNciF2SY6FhALqrG4wkHYm0O7u9Gnt SsAuigdtgKMJ1DXXPkFVa2nag722KS/wNvb0oW/7lCydu0PIEPqMwZKDPqxvsOgn38Vl A3fTCnhY1A5az4pBXf9mpRxW4Fysgdq4B6WXFQsCCDqz8rOwgVgA5mMP9SrApV1slxvP x6UA== X-Gm-Message-State: AOAM530+e7aU809TNNzChXlzms+KheE8Vr9Tah84iaP2IVjd2oK89ghy gmI4ZOSKPeyS6Sctj6xx3CjeMceh80MbxL9L9j0= X-Google-Smtp-Source: ABdhPJyv4Uctm4U/sUeFYuVFuO+EqA2ARaP58COOJrPLfc+dVDXglCh7+B6FnM2w7S86j99/A6IBIypKwHCmv/cxsmE= X-Received: by 2002:a17:907:72cf:: with SMTP id du15mr17710629ejc.54.1625560263689; Tue, 06 Jul 2021 01:31:03 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: "Martin Jansa" Date: Tue, 6 Jul 2021 10:30:52 +0200 Message-ID: Subject: Re: [OE-core][dunfell 13/19] pypi: set SRC_URI with _prepend, not with += To: Steve Sakoman Cc: Patches and discussions about the oe-core layer Content-Type: multipart/alternative; boundary="000000000000140a8d05c6703ecf" --000000000000140a8d05c6703ecf Content-Type: text/plain; charset="UTF-8" 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 wrote: > From: Alexander Kanavin > > 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 > Signed-off-by: Alexandre Belloni > (cherry picked from commit 8f17b8bce85efb0e9a7e15d0b98a5cf7b6bd9750) > Signed-off-by: Steve Sakoman > --- > 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 > > > > > --000000000000140a8d05c6703ecf Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Is this one worth backporting? It breaks some recipes in o= ther layers (e.g. podman-compose in meta-virtualization=C2=A0http://git.yoctoproject.org/cgit/cgi= t.cgi/meta-virtualization/commit/?id=3D92f976404b7f82c97996ffce94ca2d20be2d= cbda) 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 <steve@sakoman.com> wrote:
From: Alexander Kanavin <alex.kanavin@gmail.com&g= t;

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 <alex.kanavin@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 8f17b8bce85efb0e9a7e15d0b98a5cf7b6bd9750)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
=C2=A0meta/classes/pypi.bbclass | 2 +-
=C2=A01 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 ?=3D "${@pypi_src_uri(d)}"

=C2=A0HOMEPAGE ?=3D "https://pypi.python.org/= pypi/${PYPI_PACKAGE}/"
=C2=A0SECTION =3D "devel/python"
-SRC_URI +=3D "${PYPI_SRC_URI}"
+SRC_URI_prepend =3D "${PYPI_SRC_URI} "
=C2=A0S =3D "${WORKDIR}/${PYPI_PACKAGE}-${PV}"

=C2=A0UPSTREAM_CHECK_URI ?=3D "https://pypi.org/p= roject/${PYPI_PACKAGE}/"
--
2.25.1




--000000000000140a8d05c6703ecf--