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:34:30 +0100
commit0033983cf301cd90ac665010a4747c5d84e2f21f (patch)
tree319224b169f661992850de3595526cc74b114c08
parent2afdfbb70d76bcdc1be28e1e26d3505ce0464987 (diff)
downloadpoky-0033983cf301cd90ac665010a4747c5d84e2f21f.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: 05a87be51b44608ce4f77ac332df90a3cd2445ef) 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 += "\
102SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native" 102SSTATE_EXCLUDEDEPS_SYSROOT += ".*->autoconf-archive-native"
103 103
104# We need to keep bitbake tools in PATH 104# We need to keep bitbake tools in PATH
105PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" 105# Avoid empty path entries
106BITBAKEPATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}"
107PATH := "${@'${BITBAKEPATH}:' if '${BITBAKEPATH}' is not '' else ''}${HOSTTOOLS_DIR}"