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-15 20:08:15 -0800
commit9bc41e1e8d8e8e7981a33e9c3baecec48f0fa663 (patch)
treedc7e17d8a7864ddbb6eaf2a11bb87065ccec0391
parentf43d97af9466580c3a10d766791836b42c674497 (diff)
downloadopenembedded-core-contrib-9bc41e1e8d8e8e7981a33e9c3baecec48f0fa663.tar.gz
openembedded-core-contrib-9bc41e1e8d8e8e7981a33e9c3baecec48f0fa663.tar.bz2
openembedded-core-contrib-9bc41e1e8d8e8e7981a33e9c3baecec48f0fa663.zip
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: e551e73a094f5a1937bce78de9e41908bf3e07c3) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/toaster14
1 files changed, 2 insertions, 12 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 37a11165d2..fd6cabf378 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/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