From 55261cd7eb9e2a9958e48f1a5720b4e7b87bc461 Mon Sep 17 00:00:00 2001 From: Sourabh Banerjee Date: Tue, 13 Oct 2020 22:15:10 +0530 Subject: layer.conf: fix sanity error for PATH variable in extensible SDK workflow Sanity checker reports following error for the PATH variable, when bitbake -e 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 Signed-off-by: Richard Purdie (cherry picked from commit 05a87be51b44608ce4f77ac332df90a3cd2445ef) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/conf/layer.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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}" -- cgit v1.2.3-54-g00ecf