[v2] isar-bootstrap: Fix SRC_URI inclusion

Message ID 20211018125832.507603-1-Vijaikumar_Kanagarajan@mentor.com
State Accepted, archived
Headers show
Series [v2] isar-bootstrap: Fix SRC_URI inclusion | expand

Commit Message

Vijai Kumar K Oct. 18, 2021, 3:58 a.m. UTC
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(-)

Comments

Anton Mikanovich Nov. 2, 2021, 6:20 a.m. UTC | #1
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.

Patch

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))
 }