diff options
| author |   Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-08-12 15:45:48 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-29 13:56:50 +0100 |
| commit | 95df54238b6013c374215905b1937fbac72cdd63 (patch) | |
| tree | 42f1f2061f9583c3906bb3f8674534d496792210 /bitbake/bin | |
| parent | 565f69205f130644dee136c8296dd0dc979e492b (diff) | |
| download | openembedded-core-contrib-95df54238b6013c374215905b1937fbac72cdd63.tar.gz | |
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 <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
| -rwxr-xr-x | bitbake/bin/toaster | 9 |
1 files changed, 6 insertions, 3 deletions
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 </dev/null >${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" |