diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-10-15 09:34:14 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:07:29 +0100 |
| commit | 5368d9af4e2c121938fc2421a536fb7f20a987fd (patch) | |
| tree | da7eceb772b9ec41d01f52262965a803e2489359 | |
| parent | 4f409d8c01bae898ea142bd1417db99e12067753 (diff) | |
| download | bitbake-5368d9af4e2c121938fc2421a536fb7f20a987fd.tar.gz | |
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.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bin/toaster | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/toaster b/bin/toaster index e976604c5..75d3390d0 100755 --- a/bin/toaster +++ b/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 |