diff options
| author |   Awais Belal <awais_belal@mentor.com> | 2018-11-02 02:40:15 +0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-02 22:53:58 +0000 |
| commit | 9cc6fe4be797e106899d2448797a4b3af8eace4e (patch) | |
| tree | 30828fa2bdd91c7ba92cfcd30af851f015ac218b | |
| parent | 5a7009c204f4d2254e3b2d83ad9319ac23f1cf4d (diff) | |
| download | bitbake-9cc6fe4be797e106899d2448797a4b3af8eace4e.tar.gz | |
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@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 |