[oe-commits] [bitbake] 01/02: bitbake: toaster: allow OE_ROOT to be provided through environment

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 9cc6fe4be797e106899d2448797a4b3af8eace4e
Author: Awais Belal <awais_belal at mentor.com>
AuthorDate: Fri Nov 2 02:40:15 2018 +0500

    bitbake: toaster: allow OE_ROOT to be provided through environment
    
    Updates for YOCTO #12891 allowed a user to have a directory
    structure different to that of yocto (bitbake isn't inside
    oe-core) whereas the definition of OE_ROOT in the main toaster
    binary still assumes the same while checking for .templateconf
    and hence we see an error on the cmdline in such cases:
    bash: <repo-path>/bitbake/bin/../../.templateconf: No such file or directory
    The change here now allows the user to provide OE_ROOT through
    the environment in such cases and otherwise defaults to the older
    mechanism to fix this issue.
    
    Signed-off-by: Awais Belal <awais_belal at mentor.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 bin/toaster | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/toaster b/bin/toaster
index 9fffbc6..ecf66fa 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -161,7 +161,9 @@ fi
 
 export BBBASEDIR=`dirname $TOASTER`/..
 MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
-OE_ROOT=`dirname $TOASTER`/../..
+if [ -z "$OE_ROOT" ]; then
+    OE_ROOT=`dirname $TOASTER`/../..
+fi
 
 # this is the configuraton file we are using for toaster
 # we are using the same logic that oe-setup-builddir uses

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.