From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7018102194747473920 Date: Mon, 18 Oct 2021 05:44:49 -0700 (PDT) From: "vijaikumar....@gmail.com" To: isar-users Message-Id: <6d165415-c3a6-49ca-b20b-e8503da0b16an@googlegroups.com> In-Reply-To: <21f88315-1004-a7c6-73e5-196f18182cb0@ilbers.de> References: <20211012081922.31157-1-Vijaikumar_Kanagarajan@mentor.com> <21f88315-1004-a7c6-73e5-196f18182cb0@ilbers.de> Subject: Re: [PATCH] isar-bootstrap: Fix SRC_URI inclusion MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_3984_1683757500.1634561089832" X-TUID: X2wjp+6+3GOl ------=_Part_3984_1683757500.1634561089832 Content-Type: multipart/alternative; boundary="----=_Part_3985_1186939369.1634561089832" ------=_Part_3985_1186939369.1634561089832 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On Thursday, October 14, 2021 at 12:10:24 PM UTC+5:30 ami...@ilbers.de wrote: > On 12.10.21 11:19, Vijai Kumar K wrote: > > Fix commit 447b298. > > > > Include the right entries to SRC_URI. > > > > Signed-off-by: Vijai Kumar K > > --- > > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > > index b8af676..9f297ce 100644 > > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > > @@ -64,7 +64,7 @@ python () { > > d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) > > > > distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + > "DISTRO_APT_PREFERENCES", True) > > - for file in distro_apt_sources.split(): > > + for file in distro_apt_preferences.split(): > > d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d)) > > } > > > > There is no any check in case DISTRO_APT_PREFERENCES is not set, so this > will fail for CI targets. > Propose adding `or ""` for both distro_apt_sources and > distro_apt_preferences here. Yes. V2 coming up. > > > -- > Anton Mikanovich > Promwad Ltd. > External service provider of ilbers GmbH > Maria-Merian-Str. 8 > 85521 Ottobrunn, Germany > +49 (89) 122 67 24-0 > Commercial register Munich, HRB 214197 > General Manager: Baurzhan Ismagulov > > ------=_Part_3985_1186939369.1634561089832 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit

On Thursday, October 14, 2021 at 12:10:24 PM UTC+5:30 ami...@ilbers.de wrote:
On 12.10.21 11:19, Vijai Kumar K wrote:
> Fix commit 447b298.
>
> Include the right entries to SRC_URI.
>
> Signed-off-by: Vijai Kumar K <Vijaikumar_...@mentor.com>
> ---
> meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> index b8af676..9f297ce 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -64,7 +64,7 @@ python () {
> d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d))
>
> distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True)
> - for file in distro_apt_sources.split():
> + for file in distro_apt_preferences.split():
> d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d))
> }
>

There is no any check in case DISTRO_APT_PREFERENCES is not set, so this
will fail for CI targets.
Propose adding `or ""` for both distro_apt_sources and
distro_apt_preferences here.

Yes. V2 coming up.
 


--
Anton Mikanovich
Promwad Ltd.
External service provider of ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn, Germany
+49 (89) 122 67 24-0
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov

------=_Part_3985_1186939369.1634561089832-- ------=_Part_3984_1683757500.1634561089832--