diff options
Diffstat (limited to 'bitbake/bin/toaster')
-rwxr-xr-x | bitbake/bin/toaster | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 2397319916..71f882e744 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
@@ -285,16 +285,13 @@ case $CMD in | |||
285 | start ) | 285 | start ) |
286 | start_success=1 | 286 | start_success=1 |
287 | addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE | 287 | addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE |
288 | echo > ${BUILDDIR}/conf/toaster-pre.conf | ||
288 | if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then | 289 | if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then |
289 | echo "Failed ${CMD}." | 290 | echo "Failed ${CMD}." |
290 | return 4 | 291 | return 4 |
291 | fi | 292 | fi |
292 | unset BBSERVER | 293 | unset BBSERVER |
293 | PREREAD="" | 294 | bitbake --read conf/toaster-pre.conf --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 |
294 | if [ -e ${BUILDDIR}/conf/toaster-pre.conf ]; then | ||
295 | rm ${BUILDDIR}/conf/toaster-pre.conf | ||
296 | fi | ||
297 | bitbake $PREREAD --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 | ||
298 | if [ $? -ne 0 ]; then | 295 | if [ $? -ne 0 ]; then |
299 | start_success=0 | 296 | start_success=0 |
300 | echo "Bitbake server start failed" | 297 | echo "Bitbake server start failed" |
@@ -302,7 +299,8 @@ case $CMD in | |||
302 | export BBSERVER=0.0.0.0:-1 | 299 | export BBSERVER=0.0.0.0:-1 |
303 | export DATABASE_URL=`$BBBASEDIR/lib/toaster/manage.py get-dburl` | 300 | export DATABASE_URL=`$BBBASEDIR/lib/toaster/manage.py get-dburl` |
304 | if [ $NOTOASTERUI -eq 0 ]; then # we start the TOASTERUI only if not inhibited | 301 | if [ $NOTOASTERUI -eq 0 ]; then # we start the TOASTERUI only if not inhibited |
305 | bitbake --observe-only -u toasterui >>${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid | 302 | bitbake --observe-only -u toasterui --remote-server=$BBSERVER -t xmlrpc >>${BUILDDIR}/toaster_ui.log 2>&1 \ |
303 | & echo $! >${BUILDDIR}/.toasterui.pid | ||
306 | fi | 304 | fi |
307 | fi | 305 | fi |
308 | if [ $start_success -eq 1 ]; then | 306 | if [ $start_success -eq 1 ]; then |