summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSourabh Banerjee <sbanerje@codeaurora.org>2020-10-13 22:15:10 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-10 23:55:53 +0000
commit55261cd7eb9e2a9958e48f1a5720b4e7b87bc461 (patch)
tree5b840439fcf3f54ffd0be37407eb7ae4d8207a7b
parentafc3d8d3cb351944b7a346bfa4acd81d2c30fbf9 (diff)
downloadpoky-55261cd7eb9e2a9958e48f1a5720b4e7b87bc461.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. (From OE-Core rev: 0ab58355cc625e43056ae07772222be19e98f5f6) 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> 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 0249f21d07..1c432275be 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -100,4 +100,6 @@ SSTATE_EXCLUDEDEPS_SYSROOT += "\
100SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" 100SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native"
101 101
102# We need to keep bitbake tools in PATH 102# We need to keep bitbake tools in PATH
103PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" 103# Avoid empty path entries
104BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}"
105PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' is not '' else ''}${HOSTTOOLS_DIR}"