summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-05-19 13:59:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 10:09:02 +0100
commitdb843070554fe9bd518103ab922284b510ead7b5 (patch)
tree66287d8ef8d3f6c39028cd3794ea44b98ed11f68 /bitbake/bin
parent8fba59ce45de865354b0b115e1b33f5a59172614 (diff)
downloadpoky-db843070554fe9bd518103ab922284b510ead7b5.tar.gz
bitbake: toaster: Remove DATABASE_URL being passed around as an environment var
We don't need to pass the DATABASE_URL around and read it back if we setup the django framework in the correct way. We make the default sqlite database path a full path so that the database isn't being assumed to be in CWD. Also add some more useful comments on the database settings. This is preparation work to migrate the build tests and be able to trigger builds on differently configured databases. (Bitbake rev: 973c740404ca6a09feea250d3433075995067fe0) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster2
1 files changed, 0 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 921164c47e..05b7935ddb 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -100,7 +100,6 @@ stop_system()
100 fi 100 fi
101 webserverKillAll 101 webserverKillAll
102 # unset exported variables 102 # unset exported variables
103 unset DATABASE_URL
104 unset TOASTER_CONF 103 unset TOASTER_CONF
105 unset TOASTER_DIR 104 unset TOASTER_DIR
106 unset BITBAKE_UI 105 unset BITBAKE_UI
@@ -278,7 +277,6 @@ case $CMD in
278 return 4 277 return 4
279 fi 278 fi
280 export BITBAKE_UI='toasterui' 279 export BITBAKE_UI='toasterui'
281 export DATABASE_URL=`$MANAGE get-dburl`
282 $MANAGE runbuilds & echo $! >${BUILDDIR}/.runbuilds.pid 280 $MANAGE runbuilds & echo $! >${BUILDDIR}/.runbuilds.pid
283 # set fail safe stop system on terminal exit 281 # set fail safe stop system on terminal exit
284 trap stop_system SIGHUP 282 trap stop_system SIGHUP