aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSourabh Banerjee <sbanerje@codeaurora.org>2020-10-13 22:15:10 +0530
committerSteve Sakoman <steve@sakoman.com>2021-02-08 06:15:17 -1000
commit0ab58355cc625e43056ae07772222be19e98f5f6 (patch)
treeb72b9f2f8a090b20754e2cb86ae98a893403f95e
parentabfcabb070ef133f9b76c08b044a9fccd474b7ca (diff)
downloadopenembedded-core-contrib-0ab58355cc625e43056ae07772222be19e98f5f6.tar.gz
openembedded-core-contrib-0ab58355cc625e43056ae07772222be19e98f5f6.tar.bz2
openembedded-core-contrib-0ab58355cc625e43056ae07772222be19e98f5f6.zip
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>
-rw-r--r--meta/conf/layer.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 0249f21d074..1c432275be8 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}"