[oe-commits] [bitbake] 03/03: toaster: remove cut and paste cruft
git at git.openembedded.org
git at git.openembedded.org
Thu Jan 4 18:05:41 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch 1.32
in repository bitbake.
commit aeed732ff6e8c1009c5efad3aadbbd3b0bbaeea7
Author: brian avery <brian.avery at intel.com>
AuthorDate: Tue Feb 7 12:36:13 2017 -0800
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
bin/toaster | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/bin/toaster b/bin/toaster
index f3fcf04..73701a3 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
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list