summaryrefslogtreecommitdiffstats
path: root/bitbake/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:09:25 +0100
commit71f553b0227a3f36fe5b8d0f536b04b3c13eb2d7 (patch)
tree6d543e0c64b7b96c85c9e34297f0adf6c401aaf1 /bitbake/bin
parent49039829e1968418e903e5c0fda9bbbd8629f4db (diff)
downloadpoky-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-xbitbake/bin/toaster15
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()
101 fi 101 fi
102 webserverKillAll 102 webserverKillAll
103 # unset exported variables 103 # unset exported variables
104 unset TOASTER_CONF
105 unset TOASTER_DIR 104 unset TOASTER_DIR
106 unset BITBAKE_UI 105 unset BITBAKE_UI
107 unset BBBASEDIR 106 unset BBBASEDIR
@@ -154,23 +153,9 @@ if [ -n "$TEMPLATECONF" ]; then
154 if [ -d "$OEROOT/$TEMPLATECONF" ]; then 153 if [ -d "$OEROOT/$TEMPLATECONF" ]; then
155 TEMPLATECONF="$OEROOT/$TEMPLATECONF" 154 TEMPLATECONF="$OEROOT/$TEMPLATECONF"
156 fi 155 fi
157 if [ ! -d "$TEMPLATECONF" ]; then
158 echo >&2 "Error: '$TEMPLATECONF' must be a directory containing toasterconf.json"
159 return 1
160 fi
161 fi 156 fi
162fi 157fi
163 158
164if [ "$TOASTER_CONF" = "" ]; then
165 TOASTER_CONF="$TEMPLATECONF/toasterconf.json"
166 export TOASTER_CONF=$(python3 -c "import os; print(os.path.realpath('$TOASTER_CONF'))")
167fi
168
169if [ ! -f $TOASTER_CONF ]; then
170 echo "$TOASTER_CONF configuration file not found. Set TOASTER_CONF to specify file or fix .templateconf"
171 return 1
172fi
173
174# this defines the dir toaster will use for 159# this defines the dir toaster will use for
175# 1) clones of layers (in _toaster_clones ) 160# 1) clones of layers (in _toaster_clones )
176# 2) the build dir (in build) 161# 2) the build dir (in build)