diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-12-02 10:02:36 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-07 17:19:12 +0000 |
| commit | c5d5da095d5eace03f8a50910f5a60ab35acbb1a (patch) | |
| tree | 2f5ab567f31760db019bf0d51257293141988cf2 /bin/toaster | |
| parent | ac4800cc8b765b270f27ea9a5938f3f2a2e0ced4 (diff) | |
| download | bitbake-contrib-c5d5da095d5eace03f8a50910f5a60ab35acbb1a.tar.gz | |
toaster: run bitbake the same way
Run bitbake in toaster script the same way as it's run
by localbuildcontroller.
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>
Diffstat (limited to 'bin/toaster')
| -rwxr-xr-x | bin/toaster | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bin/toaster b/bin/toaster index 239731991..71f882e74 100755 --- a/bin/toaster +++ b/bin/toaster @@ -285,16 +285,13 @@ case $CMD in start ) start_success=1 addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE + echo > ${BUILDDIR}/conf/toaster-pre.conf if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then echo "Failed ${CMD}." return 4 fi unset BBSERVER - PREREAD="" - if [ -e ${BUILDDIR}/conf/toaster-pre.conf ]; then - rm ${BUILDDIR}/conf/toaster-pre.conf - fi - bitbake $PREREAD --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 + bitbake --read conf/toaster-pre.conf --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 if [ $? -ne 0 ]; then start_success=0 echo "Bitbake server start failed" @@ -302,7 +299,8 @@ case $CMD in export BBSERVER=0.0.0.0:-1 export DATABASE_URL=`$BBBASEDIR/lib/toaster/manage.py get-dburl` if [ $NOTOASTERUI -eq 0 ]; then # we start the TOASTERUI only if not inhibited - bitbake --observe-only -u toasterui >>${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid + bitbake --observe-only -u toasterui --remote-server=$BBSERVER -t xmlrpc >>${BUILDDIR}/toaster_ui.log 2>&1 \ + & echo $! >${BUILDDIR}/.toasterui.pid fi fi if [ $start_success -eq 1 ]; then |