From 779539cfb9447fca3bb6c489ab0e1702455c304c Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 15 Oct 2015 09:34:14 -0700 Subject: bitbake: toaster: use path to the script to guess config path Used $TOASTER variable(path to the toaster script) instead of current directory name to get path to the toasterconf.json This way script should work in both modes and it doesn't depend on the current directory. (Bitbake rev: 5368d9af4e2c121938fc2421a536fb7f20a987fd) Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index e976604c5c..75d3390d04 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -194,11 +194,11 @@ fi # in the local layers that currently prevent using an arbitrary # toasterconf.json if [ "$TOASTER_CONF" = "" ]; then - BIN_DIR=$(dirname -- "$0") - export TOASTER_CONF="$BIN_DIR/../../meta-yocto/conf/toasterconf.json" + TOASTER_CONF="$(dirname $TOASTER)/../../meta-yocto/conf/toasterconf.json" + export TOASTER_CONF=$(python -c "import os; print os.path.realpath('$TOASTER_CONF')") fi if [ ! -f $TOASTER_CONF ]; then - echo "$TOASTER_CONF configuration file not found, exiting..." + echo "$TOASTER_CONF configuration file not found. set TOASTER_CONF to specify a path" exit 1; fi # this defines the dir toaster will use for -- cgit v1.2.3-54-g00ecf