[PATCH] oe-buildenv-internal: Fix finding build directory

[PATCH] oe-buildenv-internal: Fix finding build directory

[Richard Purdie]

The intent of the env setup scripts is to set BBPATH to point at the
build directory if not already set. This means if the user changes
directory, bitbake can still find the original build directory. The
default bblayers.conf files reset BBPATH to the correct components so
this is safe and restores the behaviour the script was intended to have.

[YOCTO #12163]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 scripts/oe-buildenv-internal | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index e6cd141..abc5aff 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -105,6 +105,11 @@ fi
 
 BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
 BUILDDIR=$(readlink -f "$BUILDDIR")
+if [ -z "$BBPATH" ]; then
+    BBPATH=$BUILDDIR
+fi
+
+export BBPATH
 
 if [ ! -d "$BITBAKEDIR" ]; then
     echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist!  Please ensure a copy of bitbake exists at this location or specify an alternative path on the command line"
-- 
2.7.4

Re: [PATCH] oe-buildenv-internal: Fix finding build directory

[Otavio Salvador]

On Sat, Oct 21, 2017 at 10:06 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> The intent of the env setup scripts is to set BBPATH to point at the
> build directory if not already set. This means if the user changes
> directory, bitbake can still find the original build directory. The
> default bblayers.conf files reset BBPATH to the correct components so
> this is safe and restores the behaviour the script was intended to have.
>
> [YOCTO #12163]
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

A warning letting user know that it not going to be run would be good,
also printing the current value

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] oe-buildenv-internal: Fix finding build directory

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]

On 21 October 2017 at 13:06, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> The intent of the env setup scripts is to set BBPATH to point at the
> build directory if not already set. This means if the user changes
> directory, bitbake can still find the original build directory. The
> default bblayers.conf files reset BBPATH to the correct components so
> this is safe and restores the behaviour the script was intended to have.
>
> [YOCTO #12163]
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  scripts/oe-buildenv-internal | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
> index e6cd141..abc5aff 100755
> --- a/scripts/oe-buildenv-internal
> +++ b/scripts/oe-buildenv-internal
> @@ -105,6 +105,11 @@ fi
>
>  BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
>  BUILDDIR=$(readlink -f "$BUILDDIR")
> +if [ -z "$BBPATH" ]; then
> +    BBPATH=$BUILDDIR
> +fi
> +
> +export BBPATH
>

This breaks the use-case of the user switching between build directories as
re-executing oe-init-build-env doesn't change BBPATH.

Ross

[-- Attachment #2: Type: text/html, Size: 1669 bytes --]

Re: [PATCH] oe-buildenv-internal: Fix finding build directory

[Otavio Salvador]

On Tue, Oct 31, 2017 at 9:16 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 21 October 2017 at 13:06, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>>
>> The intent of the env setup scripts is to set BBPATH to point at the
>> build directory if not already set. This means if the user changes
>> directory, bitbake can still find the original build directory. The
>> default bblayers.conf files reset BBPATH to the correct components so
>> this is safe and restores the behaviour the script was intended to have.
>>
>> [YOCTO #12163]
>>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>>  scripts/oe-buildenv-internal | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
>> index e6cd141..abc5aff 100755
>> --- a/scripts/oe-buildenv-internal
>> +++ b/scripts/oe-buildenv-internal
>> @@ -105,6 +105,11 @@ fi
>>
>>  BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
>>  BUILDDIR=$(readlink -f "$BUILDDIR")
>> +if [ -z "$BBPATH" ]; then
>> +    BBPATH=$BUILDDIR
>> +fi
>> +
>> +export BBPATH
>
>
> This breaks the use-case of the user switching between build directories as
> re-executing oe-init-build-env doesn't change BBPATH.

I know and that's why I asked for a warning! ;-)

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] oe-buildenv-internal: Fix finding build directory

[Richard Purdie]

On Tue, 2017-10-31 at 21:25 -0200, Otavio Salvador wrote:
> On Tue, Oct 31, 2017 at 9:16 PM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > 
> > On 21 October 2017 at 13:06, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > > 
> > > diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-
> > > internal
> > > index e6cd141..abc5aff 100755
> > > --- a/scripts/oe-buildenv-internal
> > > +++ b/scripts/oe-buildenv-internal
> > > @@ -105,6 +105,11 @@ fi
> > > 
> > >  BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
> > >  BUILDDIR=$(readlink -f "$BUILDDIR")
> > > +if [ -z "$BBPATH" ]; then
> > > +    BBPATH=$BUILDDIR
> > > +fi
> > > +
> > > +export BBPATH
> > 
> > This breaks the use-case of the user switching between build
> > directories as
> > re-executing oe-init-build-env doesn't change BBPATH.
> I know and that's why I asked for a warning! ;-)

My patch as it stands clearly can't go in.

Our options are:

a) make that codepath unconditional (which may be no bad thing) and 
   use BBPATH
b) use a specific variable for bitbake, the script sets BUILDDIR
c) start allowing the external code to set TOPDIR directly

I think I'm leaning towards a) or possibly c). I don't really like b).
I tried c) locally and its behaving oddly. a) is known to work.

Chris, any thoughts on the original intentions or what we should do
here?

Cheers,

Richard

Re: [PATCH] oe-buildenv-internal: Fix finding build directory

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

On 1 November 2017 at 22:04, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2017-10-31 at 21:25 -0200, Otavio Salvador wrote:
> > On Tue, Oct 31, 2017 at 9:16 PM, Burton, Ross <ross.burton@intel.com>
> > wrote:
> > >
> > > On 21 October 2017 at 13:06, Richard Purdie
> > > <richard.purdie@linuxfoundation.org> wrote:
> > > >
> > > > diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-
> > > > internal
> > > > index e6cd141..abc5aff 100755
> > > > --- a/scripts/oe-buildenv-internal
> > > > +++ b/scripts/oe-buildenv-internal
> > > > @@ -105,6 +105,11 @@ fi
> > > >
> > > >  BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
> > > >  BUILDDIR=$(readlink -f "$BUILDDIR")
> > > > +if [ -z "$BBPATH" ]; then
> > > > +    BBPATH=$BUILDDIR
> > > > +fi
> > > > +
> > > > +export BBPATH
> > >
> > > This breaks the use-case of the user switching between build
> > > directories as
> > > re-executing oe-init-build-env doesn't change BBPATH.
> > I know and that's why I asked for a warning! ;-)
>
> My patch as it stands clearly can't go in.
>
> Our options are:
>
> a) make that codepath unconditional (which may be no bad thing) and
>    use BBPATH
> b) use a specific variable for bitbake, the script sets BUILDDIR
> c) start allowing the external code to set TOPDIR directly
>
> I think I'm leaning towards a) or possibly c). I don't really like b).
> I tried c) locally and its behaving oddly. a) is known to work.
>

(a) seems like the right fix here.  At least, that's what I expected to
happen...

Ross

[-- Attachment #2: Type: text/html, Size: 2409 bytes --]

Re: [PATCH] oe-buildenv-internal: Fix finding build directory

[Otavio Salvador]

On Wed, Nov 1, 2017 at 10:51 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 1 November 2017 at 22:04, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>>
>> On Tue, 2017-10-31 at 21:25 -0200, Otavio Salvador wrote:
>> > On Tue, Oct 31, 2017 at 9:16 PM, Burton, Ross <ross.burton@intel.com>
>> > wrote:
>> > >
>> > > On 21 October 2017 at 13:06, Richard Purdie
>> > > <richard.purdie@linuxfoundation.org> wrote:
>> > > >
>> > > > diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-
>> > > > internal
>> > > > index e6cd141..abc5aff 100755
>> > > > --- a/scripts/oe-buildenv-internal
>> > > > +++ b/scripts/oe-buildenv-internal
>> > > > @@ -105,6 +105,11 @@ fi
>> > > >
>> > > >  BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
>> > > >  BUILDDIR=$(readlink -f "$BUILDDIR")
>> > > > +if [ -z "$BBPATH" ]; then
>> > > > +    BBPATH=$BUILDDIR
>> > > > +fi
>> > > > +
>> > > > +export BBPATH
>> > >
>> > > This breaks the use-case of the user switching between build
>> > > directories as
>> > > re-executing oe-init-build-env doesn't change BBPATH.
>> > I know and that's why I asked for a warning! ;-)
>>
>> My patch as it stands clearly can't go in.
>>
>> Our options are:
>>
>> a) make that codepath unconditional (which may be no bad thing) and
>>    use BBPATH
>> b) use a specific variable for bitbake, the script sets BUILDDIR
>> c) start allowing the external code to set TOPDIR directly
>>
>> I think I'm leaning towards a) or possibly c). I don't really like b).
>> I tried c) locally and its behaving oddly. a) is known to work.
>
>
> (a) seems like the right fix here.  At least, that's what I expected to
> happen...

+1


-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750