From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
To: <isar-users@googlegroups.com>
Cc: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
Subject: [PATCH v2] isar-bootstrap: Fix SRC_URI inclusion
Date: Mon, 18 Oct 2021 18:28:32 +0530 [thread overview]
Message-ID: <20211018125832.507603-1-Vijaikumar_Kanagarajan@mentor.com> (raw)
In-Reply-To: <6d165415-c3a6-49ca-b20b-e8503da0b16an@googlegroups.com>
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
next prev parent reply other threads:[~2021-10-18 12:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-12 8:19 [PATCH] " 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 ` Vijai Kumar K [this message]
2021-11-02 16:20 ` [PATCH v2] " Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211018125832.507603-1-Vijaikumar_Kanagarajan@mentor.com \
--to=vijaikumar_kanagarajan@mentor.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox