diff options
| author |   Belal, Awais <Awais_Belal@mentor.com> | 2018-11-02 02:40:15 +0500 |
|---|---|---|
| committer |   Armin Kuster <akuster@mvista.com> | 2018-11-09 07:45:46 -0800 |
| commit | 9a7ead70ad36d62416089bc26950aead4b79c4fb (patch) | |
| tree | 7ee4daba8cbedc17f8ffad173c48e8ffcc80e827 | |
| parent | 67189588a68b9bcb39421ef12103507b4c8820c3 (diff) | |
| download | bitbake-contrib-9a7ead70ad36d62416089bc26950aead4b79c4fb.tar.gz | |
bitbake: toaster: allow OE_ROOT to be provided through environmentakuster/1.38
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@mentor.com>
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Armin Kuster <akuster@mvista.com>
| -rwxr-xr-x | bin/toaster | 4 |
1 files changed, 3 insertions, 1 deletions
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 |