diff options
author | brian avery <brian.avery@intel.com> | 2017-02-07 12:36:13 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 20:08:15 -0800 |
commit | 9bc41e1e8d8e8e7981a33e9c3baecec48f0fa663 (patch) | |
tree | dc7e17d8a7864ddbb6eaf2a11bb87065ccec0391 /bitbake/bin | |
parent | f43d97af9466580c3a10d766791836b42c674497 (diff) | |
download | poky-9bc41e1e8d8e8e7981a33e9c3baecec48f0fa663.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: e551e73a094f5a1937bce78de9e41908bf3e07c3)
Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/toaster | 14 |
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 | |||
151 | 151 | ||
152 | unset OE_ROOT | 152 | unset 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. | ||
161 | export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR" | ||
162 | export TOASTER_DIR=`pwd` | ||
163 | 155 | ||
164 | WEBSERVER=1 | 156 | WEBSERVER=1 |
165 | ADDR_PORT="localhost:8000" | 157 | ADDR_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. | ||
221 | export TOASTER_DIR=`dirname $BUILDDIR` | 210 | export TOASTER_DIR=`dirname $BUILDDIR` |
211 | export 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 |
224 | if [ "$CMD" = "start" ] ; then | 214 | if [ "$CMD" = "start" ] ; then |