summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-08-01 19:49:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-11 00:08:17 +0100
commit3edd33aff2b9eef82090dc4f9b5461f901aec8be (patch)
treeef52cf2f1a1e31df97ba5597ab7029018fde4438 /bin
parente1c1c8827f3892551084bf1c0909c1b33f0dca83 (diff)
downloadbitbake-contrib-3edd33aff2b9eef82090dc4f9b5461f901aec8be.tar.gz
bitbake-contrib-3edd33aff2b9eef82090dc4f9b5461f901aec8be.tar.bz2
bitbake-contrib-3edd33aff2b9eef82090dc4f9b5461f901aec8be.zip
toaster: Remove old toaster config loading mechanism
This has been replaced using django's inbuilt loaddata. Django command documented at: https://docs.djangoproject.com/en/1.8/ref/django-admin/#django-admin-loaddata Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/toaster15
1 files changed, 0 insertions, 15 deletions
diff --git a/bin/toaster b/bin/toaster
index 80d07ab0c8..e35bfce58c 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -101,7 +101,6 @@ stop_system()
fi
webserverKillAll
# unset exported variables
- unset TOASTER_CONF
unset TOASTER_DIR
unset BITBAKE_UI
unset BBBASEDIR
@@ -154,23 +153,9 @@ if [ -n "$TEMPLATECONF" ]; then
if [ -d "$OEROOT/$TEMPLATECONF" ]; then
TEMPLATECONF="$OEROOT/$TEMPLATECONF"
fi
- if [ ! -d "$TEMPLATECONF" ]; then
- echo >&2 "Error: '$TEMPLATECONF' must be a directory containing toasterconf.json"
- return 1
- fi
fi
fi
-if [ "$TOASTER_CONF" = "" ]; then
- TOASTER_CONF="$TEMPLATECONF/toasterconf.json"
- export TOASTER_CONF=$(python3 -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 file or fix .templateconf"
- return 1
-fi
-
# this defines the dir toaster will use for
# 1) clones of layers (in _toaster_clones )
# 2) the build dir (in build)