summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-12-02 10:02:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-07 17:22:59 +0000
commit624240460ec32af918dcea8c04a913e3b94e012b (patch)
tree023d3f0437dbf46aeb9f3d4aa24ee6a44ef03ea9 /bin
parent6dda2916b75d688874d208192d5c7cdb302eec35 (diff)
downloadbitbake-contrib-624240460ec32af918dcea8c04a913e3b94e012b.tar.gz
toaster: stop using toaster-pre.conf
This file is not needed anymore as toaster UI doesn't write variables to it. It sets them directly on bitbake server. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/toaster3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/toaster b/bin/toaster
index c89e01570..3b5b7f868 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -135,7 +135,7 @@ stop_system()
start_bitbake() {
unset BBSERVER
- bitbake --read conf/toaster-pre.conf --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0
+ bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0
if [ $? -ne 0 ]; then
echo "Bitbake server start failed"
return 1
@@ -350,7 +350,6 @@ fi
case $CMD in
start )
addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE
- echo > ${BUILDDIR}/conf/toaster-pre.conf
if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
echo "Failed ${CMD}."
return 4