diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-21 13:00:52 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 13:40:33 +0000 |
commit | ba2cfcc6ddc06e45beb50fe1f2fc18755e155ffa (patch) | |
tree | 18c3473da7aa595d891d58195966988f9dfc0f7c | |
parent | 5dacc5516718efdf0a470e074a5c05b1ecf8cc15 (diff) | |
download | poky-ba2cfcc6ddc06e45beb50fe1f2fc18755e155ffa.tar.gz |
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]
(From OE-Core rev: 82eeb934997c9eaa6443079dfb649a89872a222c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/oe-buildenv-internal | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index e6cd141ff5..77f98a32b9 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal | |||
@@ -105,6 +105,9 @@ fi | |||
105 | 105 | ||
106 | BITBAKEDIR=$(readlink -f "$BITBAKEDIR") | 106 | BITBAKEDIR=$(readlink -f "$BITBAKEDIR") |
107 | BUILDDIR=$(readlink -f "$BUILDDIR") | 107 | BUILDDIR=$(readlink -f "$BUILDDIR") |
108 | BBPATH=$BUILDDIR | ||
109 | |||
110 | export BBPATH | ||
108 | 111 | ||
109 | if [ ! -d "$BITBAKEDIR" ]; then | 112 | if [ ! -d "$BITBAKEDIR" ]; then |
110 | 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" | 113 | 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" |