[bitbake-devel] [PATCH] bitbake: toaster: allow OE_ROOT to be provided through environment

[Reyna, David]

Hi Awais,

I agree to the idea. My only concern is that you are using a bashism to expand the variable, and that will fail on systems that for example are based on "dash". Since the "toaster" script is sourced, it cannot override the shell executor to "bash".

While not as compact, I would prefer a shell-safe expansion such as:

vvvv

if [ -z "$OE_ROOT" ] ; then
    OE_ROOT=`dirname $TOASTER`/../..
endif

^^^^

- David

-----Original Message-----
From: bitbake-devel-bounces at lists.openembedded.org [mailto:bitbake-devel-bounces at lists.openembedded.org] On Behalf Of Awais Belal
Sent: Thursday, November 01, 2018 6:35 AM
To: bitbake-devel at lists.openembedded.org
Subject: [bitbake-devel] [PATCH] 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>
---
 bin/toaster | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/toaster b/bin/toaster
index 9fffbc6..4e227cc 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -161,7 +161,7 @@ fi
 
 export BBBASEDIR=`dirname $TOASTER`/..
 MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
-OE_ROOT=`dirname $TOASTER`/../..
+OE_ROOT=${OE_ROOT:-`dirname $TOASTER`/../..}
 
 # this is the configuraton file we are using for toaster
 # we are using the same logic that oe-setup-builddir uses
-- 
2.7.4

-- 
_______________________________________________
bitbake-devel mailing list
bitbake-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel