summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/toaster12
1 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index cc631f6f56..d4715fa67b 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -36,7 +36,6 @@ function webserverKillAll()
36 done 36 done
37} 37}
38 38
39
40function webserverStartAll() 39function webserverStartAll()
41{ 40{
42 retval=0 41 retval=0
@@ -49,6 +48,14 @@ function webserverStartAll()
49 return $retval 48 return $retval
50} 49}
51 50
51# Helper functions to add a special configuration file
52
53function addtoConfiguration()
54{
55 echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
56 echo $1 >> ${BUILDDIR}/conf/$2
57}
58
52# define the stop command 59# define the stop command
53function stop_system() 60function stop_system()
54{ 61{
@@ -136,9 +143,10 @@ fi
136 143
137case $CMD in 144case $CMD in
138 start ) 145 start )
146 addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
139 webserverStartAll || return 4 147 webserverStartAll || return 4
140 unset BBSERVER 148 unset BBSERVER
141 bitbake --server-only -t xmlrpc -B localhost:8200 149 bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B localhost:8200
142 export BBSERVER=localhost:8200 150 export BBSERVER=localhost:8200
143 if [ $NOTOASTERUI == 0 ]; then # we start the TOASTERUI only if not inhibited 151 if [ $NOTOASTERUI == 0 ]; then # we start the TOASTERUI only if not inhibited
144 bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid 152 bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid