summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/toaster
diff options
context:
space:
mode:
authorbrian avery <brian.avery@intel.com>2017-02-07 12:36:13 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-04 18:05:06 +0000
commitbe00e9049fc6922fcf5e9bc4a9ff671a0c0ed43d (patch)
tree06f8609fee79cc357aaa37ed8cd60974116f61c6 /bitbake/bin/toaster
parent3b3ba69fe31d1f6d947d36fa6172b9dbff2832ce (diff)
downloadpoky-be00e9049fc6922fcf5e9bc4a9ff671a0c0ed43d.tar.gz
bitbake: toaster: remove cut and paste cruft
There was a superfluous section in toaster start/stop script that was setting the TOASTER_DIR and had a set of comments around that setting. This was done in two places and only the last one was effective. This patch removes the spurious section to make it clearer what was happening and what TOASTER_DIR was actually getting set to. (Bitbake rev: aeed732ff6e8c1009c5efad3aadbbd3b0bbaeea7) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin/toaster')
-rwxr-xr-xbitbake/bin/toaster14
1 files changed, 2 insertions, 12 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index f3fcf04c37..73701a3a74 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -151,15 +151,7 @@ fi
151 151
152unset OE_ROOT 152unset OE_ROOT
153 153
154# this defines the dir toaster will use for 154
155# 1) clones of layers (in _toaster_clones )
156# 2) the build dir (in build)
157# 3) the sqlite db if that is being used.
158# 4) pid's we need to clean up on exit/shutdown
159# note: for future. in order to make this an arbitrary directory, we need to
160# make sure that the toaster.sqlite file doesn't default to `pwd` like it currently does.
161export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR"
162export TOASTER_DIR=`pwd`
163 155
164WEBSERVER=1 156WEBSERVER=1
165ADDR_PORT="localhost:8000" 157ADDR_PORT="localhost:8000"
@@ -215,10 +207,8 @@ fi
215# 2) the build dir (in build) 207# 2) the build dir (in build)
216# 3) the sqlite db if that is being used. 208# 3) the sqlite db if that is being used.
217# 4) pid's we need to clean up on exit/shutdown 209# 4) pid's we need to clean up on exit/shutdown
218# note: for future. in order to make this an arbitrary directory, we need to
219# make sure that the toaster.sqlite file doesn't default to `pwd`
220# like it currently does.
221export TOASTER_DIR=`dirname $BUILDDIR` 210export TOASTER_DIR=`dirname $BUILDDIR`
211export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR"
222 212
223# Determine the action. If specified by arguments, fine, if not, toggle it 213# Determine the action. If specified by arguments, fine, if not, toggle it
224if [ "$CMD" = "start" ] ; then 214if [ "$CMD" = "start" ] ; then