summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-01-08 13:15:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-08 22:34:36 +0000
commit3e73af423fa55da10073add2503fb1ef361e1956 (patch)
treecd2f528217425c3e078e6dcaa681de75ef8614ae
parent3c3766927212853dfd195185caaa0fc951f049c8 (diff)
downloadpoky-3e73af423fa55da10073add2503fb1ef361e1956.tar.gz
bitbake: toaster: do not launch web browser on noweb option
This patch makes Toaster managed mode obey the "noweb" parameter by not starting the web server and launching the web browser command if the "noweb" parameter is specified. The web browser will be pointed at 127.0.0.1 instead of 0.0.0.0 [YOCTO #7039] (Bitbake rev: 4037f8b08bc9fb5c4c9f260efb847105be718a32) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/toaster7
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 6969bf7f82..a6d2e92d17 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -185,11 +185,14 @@ if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; th
185 } 185 }
186 TOASTER_MANAGED=1 186 TOASTER_MANAGED=1
187 export TOASTER_MANAGED=1 187 export TOASTER_MANAGED=1
188 if ! webserverStartAll; then 188 if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
189 echo "Failed to start the web server, stopping" 1>&2; 189 echo "Failed to start the web server, stopping" 1>&2;
190 exit 1; 190 exit 1;
191 fi 191 fi
192 xdg-open http://0.0.0.0:$WEB_PORT/ >/dev/null 2>&1 & 192 if [ $WEBSERVER -gt 0 ]; then
193 echo "Starting browser..."
194 xdg-open http://127.0.0.1:$WEB_PORT/ >/dev/null 2>&1 &
195 fi
193 trap trap_ctrlc SIGINT 196 trap trap_ctrlc SIGINT
194 echo "Running. Stop with Ctrl-C" 197 echo "Running. Stop with Ctrl-C"
195 while [ $RUNNING -gt 0 ]; do 198 while [ $RUNNING -gt 0 ]; do