diff options
author | David Reyna <David.Reyna@windriver.com> | 2017-11-30 00:55:28 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-18 15:05:30 +0000 |
commit | 299e8ff1f7f0888cf630848aa423747fb4f8eedd (patch) | |
tree | 7ecafbcb82458cb4866007d9bc7e5b24221ae028 /bitbake/bin | |
parent | 0d9914721a8750071f9b6ec233c23d8451ee1a77 (diff) | |
download | poky-299e8ff1f7f0888cf630848aa423747fb4f8eedd.tar.gz |
bitbake: toaster: add 'nobuild' option to Toaster
Add a 'nobuild' option for starting Toaster without the project
and hosted builds support. This allows a Toaster host to provide
local build statistics without opening the host to external users
building projects.
[YOCTO #12315]
(Bitbake rev: 2d14d6004b6add5ce07295fff1144ade2e54e1c9)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/toaster | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 762451df23..4036f0ad58 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
@@ -18,9 +18,10 @@ | |||
18 | # along with this program. If not, see http://www.gnu.org/licenses/. | 18 | # along with this program. If not, see http://www.gnu.org/licenses/. |
19 | 19 | ||
20 | HELP=" | 20 | HELP=" |
21 | Usage: source toaster start|stop [webport=<address:port>] [noweb] | 21 | Usage: source toaster start|stop [webport=<address:port>] [noweb] [nobuild] |
22 | Optional arguments: | 22 | Optional arguments: |
23 | [noweb] Setup the environment for building with toaster but don't start the development server | 23 | [nobuild] Setup the environment for capturing builds with toaster but disable managed builds |
24 | [noweb] Setup the environment for capturing builds with toaster but don't start the web server | ||
24 | [webport] Set the development server (default: localhost:8000) | 25 | [webport] Set the development server (default: localhost:8000) |
25 | " | 26 | " |
26 | 27 | ||
@@ -183,6 +184,7 @@ unset OE_ROOT | |||
183 | 184 | ||
184 | 185 | ||
185 | WEBSERVER=1 | 186 | WEBSERVER=1 |
187 | export TOASTER_BUILDSERVER=1 | ||
186 | ADDR_PORT="localhost:8000" | 188 | ADDR_PORT="localhost:8000" |
187 | unset CMD | 189 | unset CMD |
188 | for param in $*; do | 190 | for param in $*; do |
@@ -190,6 +192,9 @@ for param in $*; do | |||
190 | noweb ) | 192 | noweb ) |
191 | WEBSERVER=0 | 193 | WEBSERVER=0 |
192 | ;; | 194 | ;; |
195 | nobuild ) | ||
196 | TOASTER_BUILDSERVER=0 | ||
197 | ;; | ||
193 | start ) | 198 | start ) |
194 | CMD=$param | 199 | CMD=$param |
195 | ;; | 200 | ;; |
@@ -286,9 +291,13 @@ case $CMD in | |||
286 | return 4 | 291 | return 4 |
287 | fi | 292 | fi |
288 | export BITBAKE_UI='toasterui' | 293 | export BITBAKE_UI='toasterui' |
289 | $MANAGE runbuilds \ | 294 | if [ $TOASTER_BUILDSERVER -eq 1 ] ; then |
290 | </dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \ | 295 | $MANAGE runbuilds \ |
291 | & echo $! >${BUILDDIR}/.runbuilds.pid | 296 | </dev/null >>${BUILDDIR}/toaster_runbuilds.log 2>&1 \ |
297 | & echo $! >${BUILDDIR}/.runbuilds.pid | ||
298 | else | ||
299 | echo "Toaster build server not started." | ||
300 | fi | ||
292 | 301 | ||
293 | # set fail safe stop system on terminal exit | 302 | # set fail safe stop system on terminal exit |
294 | trap stop_system SIGHUP | 303 | trap stop_system SIGHUP |