summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian avery <brian.avery@intel.com>2017-02-07 12:36:13 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-13 02:47:40 -0800
commite551e73a094f5a1937bce78de9e41908bf3e07c3 (patch)
treeac4d09d33e77cc8740f0e48086385cad27a21fbc
parent2c48168a86309c0cf2be793e7409a78ba21fca14 (diff)
downloadbitbake-contrib-e551e73a094f5a1937bce78de9e41908bf3e07c3.tar.gz
bitbake-contrib-e551e73a094f5a1937bce78de9e41908bf3e07c3.tar.bz2
bitbake-contrib-e551e73a094f5a1937bce78de9e41908bf3e07c3.zip
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. Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbin/toaster14
1 files changed, 2 insertions, 12 deletions
diff --git a/bin/toaster b/bin/toaster
index 37a11165d2..fd6cabf378 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -151,15 +151,7 @@ fi
unset OE_ROOT
-# this defines the dir toaster will use for
-# 1) clones of layers (in _toaster_clones )
-# 2) the build dir (in build)
-# 3) the sqlite db if that is being used.
-# 4) pid's we need to clean up on exit/shutdown
-# note: for future. in order to make this an arbitrary directory, we need to
-# make sure that the toaster.sqlite file doesn't default to `pwd` like it currently does.
-export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR"
-export TOASTER_DIR=`pwd`
+
WEBSERVER=1
ADDR_PORT="localhost:8000"
@@ -215,10 +207,8 @@ fi
# 2) the build dir (in build)
# 3) the sqlite db if that is being used.
# 4) pid's we need to clean up on exit/shutdown
-# note: for future. in order to make this an arbitrary directory, we need to
-# make sure that the toaster.sqlite file doesn't default to `pwd`
-# like it currently does.
export TOASTER_DIR=`dirname $BUILDDIR`
+export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR"
# Determine the action. If specified by arguments, fine, if not, toggle it
if [ "$CMD" = "start" ] ; then