[Dunfell][PATCH] layer.conf: fix sanity error for PATH variable in extensible SDK workflow

[Dunfell][PATCH] layer.conf: fix sanity error for PATH variable in extensible SDK workflow

[Sourabh Banerjee]

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>
---
 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 d593492..2d9cd05 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}"
-- 
2.7.4



-- 
Regards,
Sourabh

Re: [Dunfell][PATCH] layer.conf: fix sanity error for PATH variable in extensible SDK workflow

[Sourabh Banerjee]

On 2021-02-03 21:50, Sourabh Banerjee wrote:
> 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>
> ---
>  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 d593492..2d9cd05 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}"

Hi Steve,

This is a backport from from master to Dunfell.

Regards,
Sourabh


-- 
Regards,
Sourabh

Re: [OE-core] [Dunfell][PATCH] layer.conf: fix sanity error for PATH variable in extensible SDK workflow

[Steve Sakoman]

On Wed, Feb 3, 2021 at 6:24 AM Sourabh Banerjee <sbanerje@codeaurora.org> wrote:
>
> On 2021-02-03 21:50, Sourabh Banerjee wrote:
> > 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>
> > ---
> >  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 d593492..2d9cd05 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}"
>
> Hi Steve,
>
> This is a backport from from master to Dunfell.

Got it.  Thanks!

Steve