From: Sourabh Banerjee <sbanerje@codeaurora.org>
Date: Tue, 13 Oct 2020 16:45:10 +0000 (+0530)
Subject: layer.conf: fix sanity error for PATH variable in extensible SDK workflow
X-Git-Tag: 2020-04.6-dunfell~24
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0ab58355cc625e43056ae07772222be19e98f5f6;p=openembedded-core.git

layer.conf: fix sanity error for PATH variable in extensible SDK workflow

Sanity checker reports following error for the PATH variable,
when bitbake -e <recipe> command is run in an extensible SDK workspace.
   PATH contains '.', './' or '' (empty element), which will break the build

In case of extensible SDK, PATH variable is formed with two consecutive ':'
as bb.utils.which(d.getVar('PATH'),'bitbake') call returns an empty string.

This change adds ':' if BITBAKEPATH is a non empty string.

Signed-off-by: Sourabh Banerjee <sbanerje@codeaurora.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 05a87be51b44608ce4f77ac332df90a3cd2445ef)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 0249f21d07..1c432275be 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -100,4 +100,6 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\
 SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native"
 
 # We need to keep bitbake tools in PATH
-PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}"
+# Avoid empty path entries
+BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}"
+PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' is not '' else ''}${HOSTTOOLS_DIR}"