diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2016-08-01 19:49:43 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-11 00:09:25 +0100 |
| commit | 71f553b0227a3f36fe5b8d0f536b04b3c13eb2d7 (patch) | |
| tree | 6d543e0c64b7b96c85c9e34297f0adf6c401aaf1 /bitbake/bin | |
| parent | 49039829e1968418e903e5c0fda9bbbd8629f4db (diff) | |
| download | openembedded-core-contrib-71f553b0227a3f36fe5b8d0f536b04b3c13eb2d7.tar.gz | |
bitbake: 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
(Bitbake rev: 3edd33aff2b9eef82090dc4f9b5461f901aec8be)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
| -rwxr-xr-x | bitbake/bin/toaster | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 80d07ab0c8..e35bfce58c 100755 --- a/bitbake/bin/toaster +++ b/bitbake/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) |