summaryrefslogtreecommitdiffstats
path: root/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-28 10:45:25 +0100
commit3b0967b160dc6123ef75e6f378221347bd923f1b (patch)
tree08b3b8b7f968142e54488fbf2a3aaf032d79719f /bin
parent0b8d3ac48b5a0984963d664ff5630e3b02c4ecd1 (diff)
downloadbitbake-contrib-3b0967b160dc6123ef75e6f378221347bd923f1b.tar.gz
bitbake-contrib-3b0967b160dc6123ef75e6f378221347bd923f1b.tar.bz2
bitbake-contrib-3b0967b160dc6123ef75e6f378221347bd923f1b.zip
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. 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 'bin')
-rwxr-xr-xbin/toaster10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/toaster b/bin/toaster
index 6641dbc576..f92d38ecab 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -129,7 +129,7 @@ fi
export BBBASEDIR=`dirname $TOASTER`/..
MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
-OEROOT=`dirname $TOASTER`/../..
+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
@@ -139,16 +139,18 @@ OEROOT=`dirname $TOASTER`/../..
# in the local layers that currently make using an arbitrary
# toasterconf.json difficult.
-. $OEROOT/.templateconf
+. $OE_ROOT/.templateconf
if [ -n "$TEMPLATECONF" ]; then
if [ ! -d "$TEMPLATECONF" ]; then
# Allow TEMPLATECONF=meta-xyz/conf as a shortcut
- if [ -d "$OEROOT/$TEMPLATECONF" ]; then
- TEMPLATECONF="$OEROOT/$TEMPLATECONF"
+ if [ -d "$OE_ROOT/$TEMPLATECONF" ]; then
+ TEMPLATECONF="$OE_ROOT/$TEMPLATECONF"
fi
fi
fi
+unset OE_ROOT
+
# this defines the dir toaster will use for
# 1) clones of layers (in _toaster_clones )
# 2) the build dir (in build)