diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-12-02 10:02:38 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-07 17:37:08 +0000 |
| commit | 2a96d35893f2b9444033f6af8de1475f9c0aa974 (patch) | |
| tree | af8d223d877bfcf4ba9d2ce3aefa3bce3f944662 /bitbake | |
| parent | d87a5346cfd68bbf63a79b961c0501294dfd476d (diff) | |
| download | openembedded-core-contrib-2a96d35893f2b9444033f6af8de1475f9c0aa974.tar.gz | |
bitbake: toaster: check for toaster configuration later
Moved check for toasterconf.json after check of build environment.
We'll need some variables from build environment to find toasterconf.json
better way.
(Bitbake rev: a4f6809237dffb1abff78c6a8c82bcc4852aedfa)
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')
| -rwxr-xr-x | bitbake/bin/toaster | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 1ce4af7030..359b23d6a5 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -222,7 +222,6 @@ fi # 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 @@ -260,6 +259,30 @@ if [ -z "$BUILDDIR" ] || ! which bitbake >/dev/null 2>&1 ; then return 2 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 + TOASTER_CONF="$(dirname $TOASTER)/../../meta-yocto/conf/toasterconf.json" + export TOASTER_CONF=$(python -c "import os; print os.path.realpath('$TOASTER_CONF')") +fi +if [ ! -f $TOASTER_CONF ]; then + echo "$TOASTER_CONF configuration file not found. set TOASTER_CONF to specify a path" + return 1 +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` + # Determine the action. If specified by arguments, fine, if not, toggle it if [ "$1" = 'start' ] || [ "$1" = 'stop' ]; then CMD="$1" |