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>
This commit is contained in:
parent
5b035ed9be
commit
efa8cfb365
|
@ -129,7 +129,7 @@ fi
|
||||||
|
|
||||||
export BBBASEDIR=`dirname $TOASTER`/..
|
export BBBASEDIR=`dirname $TOASTER`/..
|
||||||
MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
|
MANAGE="python3 $BBBASEDIR/lib/toaster/manage.py"
|
||||||
OEROOT=`dirname $TOASTER`/../..
|
OE_ROOT=`dirname $TOASTER`/../..
|
||||||
|
|
||||||
# this is the configuraton file we are using for toaster
|
# this is the configuraton file we are using for toaster
|
||||||
# we are using the same logic that oe-setup-builddir uses
|
# 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
|
# in the local layers that currently make using an arbitrary
|
||||||
# toasterconf.json difficult.
|
# toasterconf.json difficult.
|
||||||
|
|
||||||
. $OEROOT/.templateconf
|
. $OE_ROOT/.templateconf
|
||||||
if [ -n "$TEMPLATECONF" ]; then
|
if [ -n "$TEMPLATECONF" ]; then
|
||||||
if [ ! -d "$TEMPLATECONF" ]; then
|
if [ ! -d "$TEMPLATECONF" ]; then
|
||||||
# Allow TEMPLATECONF=meta-xyz/conf as a shortcut
|
# Allow TEMPLATECONF=meta-xyz/conf as a shortcut
|
||||||
if [ -d "$OEROOT/$TEMPLATECONF" ]; then
|
if [ -d "$OE_ROOT/$TEMPLATECONF" ]; then
|
||||||
TEMPLATECONF="$OEROOT/$TEMPLATECONF"
|
TEMPLATECONF="$OE_ROOT/$TEMPLATECONF"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
unset OE_ROOT
|
||||||
|
|
||||||
# this defines the dir toaster will use for
|
# this defines the dir toaster will use for
|
||||||
# 1) clones of layers (in _toaster_clones )
|
# 1) clones of layers (in _toaster_clones )
|
||||||
# 2) the build dir (in build)
|
# 2) the build dir (in build)
|
||||||
|
|
Loading…
Reference in New Issue