summaryrefslogtreecommitdiffstats
path: root/poky/bitbake/bin
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-09-05 22:26:40 -0700
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-09-11 20:48:09 +0000
commit5dd7cbb3457c90724fc442b15bab2082d82b560a (patch)
tree368ed59906a1874f33a3a4a44fbb2f544013dc0a /poky/bitbake/bin
parent3b32a97b1b171ca776a24454d22c1c59fc7bfa00 (diff)
downloadtalos-openbmc-5dd7cbb3457c90724fc442b15bab2082d82b560a.tar.gz
talos-openbmc-5dd7cbb3457c90724fc442b15bab2082d82b560a.zip
poky: sumo refresh 45ef387cc5..51872d3f99
Update poky to sumo HEAD. Awais Belal (8): bitbake: toaster: allow pokydirname to be evaluated when all layers are local bitbake: toaster: use a more flexible way to find bitbake bitbake: bitbake: toaster: allow TOASTER_DIR to be overridden from cmdline bitbake: toaster/widgets.py: avoid divide by zero issues bitbake: toastergui/newproject.html: fix release divs bitbake: toaster/checksettings: allow CUSTOM_XML_ONLY setting through env bitbake: toaster/models.py: allow local paths for custom recipe's base bitbake: toaster/layerdetails.js: don't hide local layer info Karsten Strand (1): bitbake: bitbake: toaster: Fix comparison in recipe template Change-Id: I8dbcad1d98ff8d3c660563781d887a2c91db5bf2 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake/bin')
-rwxr-xr-xpoky/bitbake/bin/toaster9
1 files changed, 7 insertions, 2 deletions
diff --git a/poky/bitbake/bin/toaster b/poky/bitbake/bin/toaster
index ed365ee82..9fffbc6ae 100755
--- a/poky/bitbake/bin/toaster
+++ b/poky/bitbake/bin/toaster
@@ -18,11 +18,12 @@
# along with this program. If not, see http://www.gnu.org/licenses/.
HELP="
-Usage: source toaster start|stop [webport=<address:port>] [noweb] [nobuild]
+Usage: source toaster start|stop [webport=<address:port>] [noweb] [nobuild] [toasterdir]
Optional arguments:
[nobuild] Setup the environment for capturing builds with toaster but disable managed builds
[noweb] Setup the environment for capturing builds with toaster but don't start the web server
[webport] Set the development server (default: localhost:8000)
+ [toasterdir] Set absolute path to be used as TOASTER_DIR (default: BUILDDIR/../)
"
custom_extention()
@@ -186,6 +187,7 @@ unset OE_ROOT
WEBSERVER=1
export TOASTER_BUILDSERVER=1
ADDR_PORT="localhost:8000"
+TOASTERDIR=`dirname $BUILDDIR`
unset CMD
for param in $*; do
case $param in
@@ -211,6 +213,9 @@ for param in $*; do
ADDR_PORT="localhost:$PORT"
fi
;;
+ toasterdir=*)
+ TOASTERDIR="${param#*=}"
+ ;;
--help)
echo "$HELP"
return 0
@@ -241,7 +246,7 @@ fi
# 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
-export TOASTER_DIR=`dirname $BUILDDIR`
+export TOASTER_DIR=$TOASTERDIR
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOASTER_DIR"
# Determine the action. If specified by arguments, fine, if not, toggle it
OpenPOWER on IntegriCloud