summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSourabh Banerjee <sbanerje@codeaurora.org>2020-10-13 22:15:10 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-17 12:33:30 +0100
commit05a87be51b44608ce4f77ac332df90a3cd2445ef (patch)
tree9ffbe3dcd676284d4432dde0f3a403670539bef8
parent5092e64c71930b9ff82cbba6ef6517ae4fed3475 (diff)
downloadopenembedded-core-05a87be51b44608ce4f77ac332df90a3cd2445ef.tar.gz
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>
-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 d5934927a6..2d9cd05695 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -102,4 +102,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}"