summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/toaster
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/bin/toaster')
-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)