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-24 21:45:58 +0000 |
commit | 26864d29ef5b0476cc458ff14b536ef526826573 (patch) | |
tree | 4eae347d4c8d8aa3d429585f69b152c8d4e8016b /bitbake/bin | |
parent | 4f454cdca350f15fe5f99210d8b0a3c7b54b4775 (diff) | |
download | poky-26864d29ef5b0476cc458ff14b536ef526826573.tar.gz |
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: <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.
(Bitbake rev: 79d01b9fec99cec19156e0ebe05b4f2040bcef05)
Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/toaster | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
161 | 161 | ||
162 | export BBBASEDIR=`dirname $TOASTER`/.. | 162 | export BBBASEDIR=`dirname $TOASTER`/.. |
163 | MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py" | 163 | MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py" |
164 | OE_ROOT=`dirname $TOASTER`/../.. | 164 | if [ -z "$OE_ROOT" ]; then |
165 | OE_ROOT=`dirname $TOASTER`/../.. | ||
166 | fi | ||
165 | 167 | ||
166 | # this is the configuraton file we are using for toaster | 168 | # this is the configuraton file we are using for toaster |
167 | # we are using the same logic that oe-setup-builddir uses | 169 | # we are using the same logic that oe-setup-builddir uses |