From 87f8aafd533132dbfc8bd82f2c06fa4e9f22095f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 21 Oct 2017 13:00:52 +0100 Subject: [PATCH] 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: bfacf88f15a27db579d8790d92f8497d832961f8) Signed-off-by: Richard Purdie (cherry picked from commit 82eeb934997c9eaa6443079dfb649a89872a222c) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/oe-buildenv-internal | 3 +++ 1 file changed, 3 insertions(+) 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 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"