summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian avery <avery.brian@gmail.com>2015-10-07 15:17:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-11 05:33:06 +0100
commit0dcc96323cbe1c700e241fbe488ea0da3fec3918 (patch)
tree40e9c669d4718d9827fd8458c91dfd81bffd1b91
parent8068aa3b0f60bbbc1ad4287971507a2974c58321 (diff)
downloadpoky-0dcc96323cbe1c700e241fbe488ea0da3fec3918.tar.gz
bitbake: toaster: remove bashisms so script works in dash as well
[YOCTO #8217] (Bitbake rev: be2d04c1831608922f90da03cb26d7fd5c863a47) Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/toaster9
1 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index f1aee627e2..bc439e6d3a 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -162,7 +162,7 @@ RUNNING=0
162NOTOASTERUI=0 162NOTOASTERUI=0
163WEBSERVER=1 163WEBSERVER=1
164TOASTER_BRBE="" 164TOASTER_BRBE=""
165if [ "$WEB_PORT" == "" ]; then 165if [ "$WEB_PORT" = "" ]; then
166 WEB_PORT="8000" 166 WEB_PORT="8000"
167fi 167fi
168# this is the configuraton file we are using for toaster 168# this is the configuraton file we are using for toaster
@@ -172,13 +172,13 @@ fi
172# note: for future there are a number of relative path assumptions 172# note: for future there are a number of relative path assumptions
173# in the local layers that currently prevent using an arbitrary 173# in the local layers that currently prevent using an arbitrary
174# toasterconf.json 174# toasterconf.json
175if [ "$TOASTER_CONF" == "" ]; then 175if [ "$TOASTER_CONF" = "" ]; then
176 BIN_DIR=$(dirname "${BASH_SOURCE[0]}") 176 BIN_DIR=$(dirname -- "$0")
177 export TOASTER_CONF="$BIN_DIR/../../meta-yocto/conf/toasterconf.json" 177 export TOASTER_CONF="$BIN_DIR/../../meta-yocto/conf/toasterconf.json"
178fi 178fi
179if [ ! -f $TOASTER_CONF ]; then 179if [ ! -f $TOASTER_CONF ]; then
180 echo "$TOASTER_CONF configuration file not found, exiting..." 180 echo "$TOASTER_CONF configuration file not found, exiting..."
181 exit -1 181 exit 1;
182fi 182fi
183# this defines the dir toaster will use for 183# this defines the dir toaster will use for
184# 1) clones of layers (in _toaster_clones ) 184# 1) clones of layers (in _toaster_clones )
@@ -375,4 +375,3 @@ case $CMD in
375 echo "Successful ${CMD}." 375 echo "Successful ${CMD}."
376 ;; 376 ;;
377esac 377esac
378