summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-27 16:16:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-30 16:52:22 +0100
commitefa8cfb3654343441927998446e0a4a4007f991b (patch)
tree341dc52e66b1b11441923130a1549c1ceaac3e60 /bitbake/bin
parent5b035ed9be2a79a31d25a0b527d3688a0ce6f97e (diff)
downloadpoky-efa8cfb3654343441927998446e0a4a4007f991b.tar.gz
bitbake: toaster: stop modifying OEROOT in toaster script
Setting OEROOT in toaster script makes oe-init-build-env to break with error: bash: ../bitbake/bin/../../scripts/oe-buildenv-internal: No such file or directory This happens because OEROOT contains path relative to build directory. Renamed OEROOT to OE_ROOT and unset it after it's used. (Bitbake rev: 3b0967b160dc6123ef75e6f378221347bd923f1b) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster10
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 6641dbc576..f92d38ecab 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -129,7 +129,7 @@ fi
129 129
130export BBBASEDIR=`dirname $TOASTER`/.. 130export BBBASEDIR=`dirname $TOASTER`/..
131MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py" 131MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
132OEROOT=`dirname $TOASTER`/../.. 132OE_ROOT=`dirname $TOASTER`/../..
133 133
134# this is the configuraton file we are using for toaster 134# this is the configuraton file we are using for toaster
135# we are using the same logic that oe-setup-builddir uses 135# we are using the same logic that oe-setup-builddir uses
@@ -139,16 +139,18 @@ OEROOT=`dirname $TOASTER`/../..
139# in the local layers that currently make using an arbitrary 139# in the local layers that currently make using an arbitrary
140# toasterconf.json difficult. 140# toasterconf.json difficult.
141 141
142. $OEROOT/.templateconf 142. $OE_ROOT/.templateconf
143if [ -n "$TEMPLATECONF" ]; then 143if [ -n "$TEMPLATECONF" ]; then
144 if [ ! -d "$TEMPLATECONF" ]; then 144 if [ ! -d "$TEMPLATECONF" ]; then
145 # Allow TEMPLATECONF=meta-xyz/conf as a shortcut 145 # Allow TEMPLATECONF=meta-xyz/conf as a shortcut
146 if [ -d "$OEROOT/$TEMPLATECONF" ]; then 146 if [ -d "$OE_ROOT/$TEMPLATECONF" ]; then
147 TEMPLATECONF="$OEROOT/$TEMPLATECONF" 147 TEMPLATECONF="$OE_ROOT/$TEMPLATECONF"
148 fi 148 fi
149 fi 149 fi
150fi 150fi
151 151
152unset OE_ROOT
153
152# this defines the dir toaster will use for 154# this defines the dir toaster will use for
153# 1) clones of layers (in _toaster_clones ) 155# 1) clones of layers (in _toaster_clones )
154# 2) the build dir (in build) 156# 2) the build dir (in build)