aboutsummaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorbrian avery <avery.brian@gmail.com>2015-10-07 15:17:33 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-11 05:33:05 +0100
commit315989cd9539192acb76b1028b6a7f5c5f3b3395 (patch)
tree49132c3530db11e78652f604b32fd9a47ae8d027 /bitbake/bin
parent489d5ff1c9ddcbb27e9a847153656c84bea4fd03 (diff)
downloadopenembedded-core-contrib-315989cd9539192acb76b1028b6a7f5c5f3b3395.tar.gz
bitbake: toaster: remove layer and build dir interactive questions
added TOASTER_CONF env var for toaasterconf.json added TOASTER_DIR env var for working dir added bugfix so WEB_PORT env variable is honored (Bitbake rev: c4b351e40060a359d59ab51b5ed2f9713ca1a9a5) Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster25
1 files changed, 24 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index d56d525960f..ff3123cd4ad 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -162,7 +162,30 @@ RUNNING=0
NOTOASTERUI=0
WEBSERVER=1
TOASTER_BRBE=""
-WEB_PORT="8000"
+if [ "$WEB_PORT" == "" ]; then
+ WEB_PORT="8000"
+fi
+# this is the configuraton file we are using for toaster
+# note default is assuming yocto. Override this if you are
+# running in a pure OE environment and use the toasterconf.json
+# in meta/conf/toasterconf.json
+# note: for future there are a number of relative path assumptions
+# in the local layers that currently prevent using an arbitrary
+# toasterconf.json
+if [ "$TOASTER_CONF" == "" ]; then
+ BIN_DIR=$(dirname "${BASH_SOURCE[0]}")
+ export TOASTER_CONF="$BIN_DIR/../../meta-yocto/conf/toasterconf.json"
+fi
+# this defines the dir toaster will use for
+# 1) clones of layers (in _toaster_clones )
+# 2) the build dir (in build)
+# 3) the sqlite db if that is being used.
+# 4) pid's we need to clean up on exit/shutdown
+# note: for future. in order to make this an arbitrary directory, we need to
+# make sure that the toaster.sqlite file doesn't default to `pwd` like it currently does.
+export TOASTER_DIR=`pwd`
+
+
NOBROWSER=0
for param in $*; do