summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-12-02 10:02:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-07 17:37:08 +0000
commitde812d086e017f55a7dd8f3916a138a96be7388f (patch)
tree321925a7d2d7742849c5aa162eb39dec07a5dfa9
parent28e8ccf437fa183fd34fe03ae337fb290e639617 (diff)
downloadpoky-de812d086e017f55a7dd8f3916a138a96be7388f.tar.gz
bitbake: toaster: start 'manage.py runbuilds' in the script
Running runbuilds machinery in background allows Toaster to start builds initiated by toaster UI. Added runbuilds pid file to the list in webserverKillAll to kill runbuilds the same way as runserver process. (Bitbake rev: 91bf323e873c31d883b01ea993c005f45382e83f) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/toaster3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index de03099a68..eb83e9afaa 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -31,7 +31,7 @@
31webserverKillAll() 31webserverKillAll()
32{ 32{
33 local pidfile 33 local pidfile
34 for pidfile in ${BUILDDIR}/.toastermain.pid; do 34 for pidfile in ${BUILDDIR}/.toastermain.pid ${BUILDDIR}/.runbuilds.pid; do
35 if [ -f ${pidfile} ]; then 35 if [ -f ${pidfile} ]; then
36 pid=`cat ${pidfile}` 36 pid=`cat ${pidfile}`
37 while kill -0 $pid 2>/dev/null; do 37 while kill -0 $pid 2>/dev/null; do
@@ -339,6 +339,7 @@ case $CMD in
339 bitbake --observe-only -u toasterui --remote-server=$BBSERVER -t xmlrpc >>${BUILDDIR}/toaster_ui.log 2>&1 \ 339 bitbake --observe-only -u toasterui --remote-server=$BBSERVER -t xmlrpc >>${BUILDDIR}/toaster_ui.log 2>&1 \
340 & echo $! >${BUILDDIR}/.toasterui.pid 340 & echo $! >${BUILDDIR}/.toasterui.pid
341 fi 341 fi
342 python $BBBASEDIR/lib/toaster/manage.py runbuilds & echo $! >${BUILDDIR}/.runbuilds.pid
342 fi 343 fi
343 if [ $start_success -eq 1 ]; then 344 if [ $start_success -eq 1 ]; then
344 # set fail safe stop system on terminal exit 345 # set fail safe stop system on terminal exit