diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-08-01 19:32:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-11 00:09:25 +0100 |
commit | 33a4006529ca0e463f1e1fc95daef973a6facd3f (patch) | |
tree | 0e4a099067afa1a3a13ad95a4eb6e0137a11e97a /bitbake/bin | |
parent | 72fa18fb35af5d7cb1c7f92e72781bc2c56167be (diff) | |
download | poky-33a4006529ca0e463f1e1fc95daef973a6facd3f.tar.gz |
bitbake: toaster: checksettings call django's loaddata instead of custom command
Call django's inbuilt loaddata command to load the appropriate fixtures.
We also attempt to load a fixture called "custom" and fail silently if
we don't have one. This is where initial customisations can be done to
load particular settings or data into Toaster (for example layers or
default values for variables)
Make sure the value for TEMPLATECONF is available to checksettings so
that we can have a go a working out which default data to load.
(Bitbake rev: 7d14ca8cbabbb893e507a66e4cc6e3e77c1e8c84)
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 79ab301de8..80d07ab0c8 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
@@ -59,7 +59,8 @@ webserverStartAll() | |||
59 | echo "Failed migrations, aborting system start" 1>&2 | 59 | echo "Failed migrations, aborting system start" 1>&2 |
60 | return $retval | 60 | return $retval |
61 | fi | 61 | fi |
62 | 62 | # Make sure that checksettings can pick up any value for TEMPLATECONF | |
63 | export TEMPLATECONF | ||
63 | $MANAGE checksettings --traceback || retval=1 | 64 | $MANAGE checksettings --traceback || retval=1 |
64 | 65 | ||
65 | if [ $retval -eq 1 ]; then | 66 | if [ $retval -eq 1 ]; then |