From 95df54238b6013c374215905b1937fbac72cdd63 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 12 Aug 2014 15:45:48 +0100 Subject: bitbake: toaster: update checksettings command for auto-detection We enhance the checksettings command to try to automatically detect settings for running on localhost. The checksettings will look for a nearby poky layer source, for a nearby build directory, and will try to import settings from "toasterconf.json" files found in the local layer. On new configuration, it will also perform updates from the layer source. (Bitbake rev: 2aab77dfccb538e2b09829841ea6c464d40cafb1) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index ce16de6c3b..2fabe5c8ec 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -65,10 +65,10 @@ function webserverStartAll() fi if [ "x$TOASTER_MANAGED" == "x1" ]; then python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol || retval=1 - python $BBBASEDIR/lib/toaster/manage.py checksettings || retval=1 + python $BBBASEDIR/lib/toaster/manage.py checksettings --traceback || retval=1 fi - echo "Starting webserver" if [ $retval -eq 0 ]; then + echo "Starting webserver" python $BBBASEDIR/lib/toaster/manage.py runserver 0.0.0.0:8000 ${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid sleep 1 if ! cat "${BUILDDIR}/.toastermain.pid" | xargs -I{} kill -0 {} ; then @@ -144,7 +144,10 @@ if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; th } TOASTER_MANAGED=1 export TOASTER_MANAGED=1 - webserverStartAll || (echo "Fail to start the web server, stopping" 1>&2 && exit 1) + if ! webserverStartAll; then + echo "Failed to start the web server, stopping" 1>&2; + exit 1; + fi xdg-open http://0.0.0.0:8000/ >/dev/null 2>&1 & trap trap_ctrlc SIGINT echo "Running. Stop with Ctrl-C" -- cgit v1.2.3-54-g00ecf