oe-buildenv-internal: Fix finding build directory

The intent of the env setup scripts is to set BBPATH to point at the
build directory. 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>
(cherry picked from commit 82eeb934997c9eaa6443079dfb649a89872a222c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index e6cd141ff543cb2033639c974d2f7e85af20844e..77f98a32b96a4b927b5cc7fc08caf4415d37081f 100755 (executable)
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -105,6 +105,9 @@ fi
 
 BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
 BUILDDIR=$(readlink -f "$BUILDDIR")
+BBPATH=$BUILDDIR
+
+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"