From 1bdd416102aaf9093e64c6e4f1e762bb4b115a43 Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Fri, 2 Nov 2018 02:40:15 +0500 Subject: bitbake: 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. (Bitbake rev: 9cc6fe4be797e106899d2448797a4b3af8eace4e) Signed-off-by: Awais Belal Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 9fffbc6ae2..ecf66fa51f 100755 --- a/bitbake/bin/toaster +++ b/bitbake/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 v1.2.3-54-g00ecf