From 9a7ead70ad36d62416089bc26950aead4b79c4fb Mon Sep 17 00:00:00 2001 From: "Belal, Awais" Date: Fri, 2 Nov 2018 02:40:15 +0500 Subject: 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: /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 Signed-off-by: Awais Belal Signed-off-by: Armin Kuster --- bin/toaster | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/toaster b/bin/toaster index 9fffbc6ae..ecf66fa51 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 -- cgit 1.2.3-korg