* [PATCH] isar-bootstrap: Fix SRC_URI inclusion
@ 2021-10-12 8:19 Vijai Kumar K
2021-10-12 9:00 ` Jan Kiszka
2021-10-14 6:40 ` Anton Mikanovich
0 siblings, 2 replies; 6+ messages in thread
From: Vijai Kumar K @ 2021-10-12 8:19 UTC (permalink / raw)
To: isar-users, jan.kiszka; +Cc: Vijai Kumar K
Fix commit 447b298.
Include the right entries to SRC_URI.
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@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))
}
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] isar-bootstrap: Fix SRC_URI inclusion
2021-10-12 8:19 [PATCH] isar-bootstrap: Fix SRC_URI inclusion Vijai Kumar K
@ 2021-10-12 9:00 ` Jan Kiszka
2021-10-14 6:40 ` Anton Mikanovich
1 sibling, 0 replies; 6+ messages in thread
From: Jan Kiszka @ 2021-10-12 9:00 UTC (permalink / raw)
To: Vijai Kumar K, isar-users
On 12.10.21 10:19, Vijai Kumar K wrote:
> Fix commit 447b298.
>
> Include the right entries to SRC_URI.
>
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@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))
> }
>
>
Ah, good catch!
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] isar-bootstrap: Fix SRC_URI inclusion
2021-10-12 8:19 [PATCH] isar-bootstrap: Fix SRC_URI inclusion Vijai Kumar K
2021-10-12 9:00 ` Jan Kiszka
@ 2021-10-14 6:40 ` Anton Mikanovich
2021-10-18 12:44 ` vijaikumar....@gmail.com
1 sibling, 1 reply; 6+ messages in thread
From: Anton Mikanovich @ 2021-10-14 6:40 UTC (permalink / raw)
To: isar-users; +Cc: Jan Kiszka
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_Kanagarajan@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.
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] isar-bootstrap: Fix SRC_URI inclusion
2021-10-14 6:40 ` Anton Mikanovich
@ 2021-10-18 12:44 ` vijaikumar....@gmail.com
2021-10-18 12:58 ` [PATCH v2] " Vijai Kumar K
0 siblings, 1 reply; 6+ messages in thread
From: vijaikumar....@gmail.com @ 2021-10-18 12:44 UTC (permalink / raw)
To: isar-users
[-- Attachment #1.1: Type: text/plain, Size: 1558 bytes --]
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
>
>
[-- Attachment #1.2: Type: text/html, Size: 2153 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2] isar-bootstrap: Fix SRC_URI inclusion
2021-10-18 12:44 ` vijaikumar....@gmail.com
@ 2021-10-18 12:58 ` Vijai Kumar K
2021-11-02 16:20 ` Anton Mikanovich
0 siblings, 1 reply; 6+ messages in thread
From: Vijai Kumar K @ 2021-10-18 12:58 UTC (permalink / raw)
To: isar-users; +Cc: Vijai Kumar K
Fix commit 447b298.
Include the right entries to SRC_URI.
Also, handle situations where in those variables are not set.
Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index b8af676..ab3dd66 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -59,12 +59,12 @@ python () {
filename = fetcher.localpath(key)
d.appendVar("THIRD_PARTY_APT_KEYFILES", " %s" % filename)
- distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True)
+ distro_apt_sources = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_SOURCES", True) or ""
for file in distro_apt_sources.split():
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():
+ distro_apt_preferences = d.getVar(d.getVar("DISTRO_VARS_PREFIX") + "DISTRO_APT_PREFERENCES", True) or ""
+ for file in distro_apt_preferences.split():
d.appendVar("SRC_URI", " file://%s" % bb.parse.resolve_file(file, d))
}
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] isar-bootstrap: Fix SRC_URI inclusion
2021-10-18 12:58 ` [PATCH v2] " Vijai Kumar K
@ 2021-11-02 16:20 ` Anton Mikanovich
0 siblings, 0 replies; 6+ messages in thread
From: Anton Mikanovich @ 2021-11-02 16:20 UTC (permalink / raw)
To: Vijai Kumar K, isar-users
18.10.2021 15:58, Vijai Kumar K wrote:
> Fix commit 447b298.
>
> Include the right entries to SRC_URI.
>
> Also, handle situations where in those variables are not set.
>
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Applied to next, thanks.
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-02 16:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 8:19 [PATCH] isar-bootstrap: Fix SRC_URI inclusion Vijai Kumar K
2021-10-12 9:00 ` Jan Kiszka
2021-10-14 6:40 ` Anton Mikanovich
2021-10-18 12:44 ` vijaikumar....@gmail.com
2021-10-18 12:58 ` [PATCH v2] " Vijai Kumar K
2021-11-02 16:20 ` Anton Mikanovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox