diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-10-15 09:34:16 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-16 14:13:23 +0100 |
commit | 2e2e40c2c41a69483596fc35e49b87491ee80fdc (patch) | |
tree | 1e2ad42ec690945907ba89ff63b98790983f5b17 /bitbake/bin/toaster | |
parent | a73895e492dc048da8304bdd0214c54a856fb117 (diff) | |
download | poky-2e2e40c2c41a69483596fc35e49b87491ee80fdc.tar.gz |
bitbake: toaster: set TOASTER_MANAGED variable
Set TOASTER_MANAGED to 1 if toaster is run as a script.
(Bitbake rev: 9f68f317e33d617558fce3427a94e14ef65c7d88)
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 'bitbake/bin/toaster')
-rwxr-xr-x | bitbake/bin/toaster | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index d7c5a845e4..cf93e9fd98 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
@@ -176,6 +176,8 @@ else | |||
176 | TOASTER=$0 | 176 | TOASTER=$0 |
177 | fi | 177 | fi |
178 | 178 | ||
179 | [ `basename \"$0\"` = `basename \"${TOASTER}\"` ] && TOASTER_MANAGED=1 | ||
180 | |||
179 | BBBASEDIR=`dirname $TOASTER`/.. | 181 | BBBASEDIR=`dirname $TOASTER`/.. |
180 | 182 | ||
181 | RUNNING=0 | 183 | RUNNING=0 |
@@ -232,7 +234,7 @@ for param in $*; do | |||
232 | esac | 234 | esac |
233 | done | 235 | done |
234 | 236 | ||
235 | if [ `basename \"$0\"` = `basename \"${TOASTER}\"` ]; then | 237 | if [ "$TOASTER_MANAGED" = '1' ]; then |
236 | # We are called as standalone. We refuse to run in a build environment - we need the interactive mode for that. | 238 | # We are called as standalone. We refuse to run in a build environment - we need the interactive mode for that. |
237 | # Start just the web server, point the web browser to the interface, and start any Django services. | 239 | # Start just the web server, point the web browser to the interface, and start any Django services. |
238 | 240 | ||
@@ -279,7 +281,6 @@ if [ `basename \"$0\"` = `basename \"${TOASTER}\"` ]; then | |||
279 | do_cleanup | 281 | do_cleanup |
280 | fi | 282 | fi |
281 | } | 283 | } |
282 | TOASTER_MANAGED=1 | ||
283 | export TOASTER_MANAGED=1 | 284 | export TOASTER_MANAGED=1 |
284 | if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then | 285 | if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then |
285 | echo "Failed to start the web server, stopping" 1>&2 | 286 | echo "Failed to start the web server, stopping" 1>&2 |