From patchwork Tue Feb 7 20:36:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/3] toaster: remove cut and paste cruft From: "Avery, Brian" X-Patchwork-Id: 136844 Message-Id: To: toaster@yoctoproject.org Cc: brian avery Date: Tue, 7 Feb 2017 12:36:13 -0800 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 --- bitbake/bin/toaster | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 37a1116..fd6cabf 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