summaryrefslogtreecommitdiffstats
path: root/bitbake
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:37:10 +0000
commit4186f5b04e6fc2e6e42254f03c19c7f84e3d944c (patch)
tree5f4199891d4f03a637122141901308b2d0a45c3e /bitbake
parent361faa3e6ce6e0a1c91d450b7e1f5738faf4a0eb (diff)
downloadpoky-4186f5b04e6fc2e6e42254f03c19c7f84e3d944c.tar.gz
bitbake: 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. (Bitbake rev: 624240460ec32af918dcea8c04a913e3b94e012b) 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 'bitbake')
-rwxr-xr-xbitbake/bin/toaster3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index c89e015706..3b5b7f868b 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -135,7 +135,7 @@ stop_system()
135 135
136start_bitbake() { 136start_bitbake() {
137 unset BBSERVER 137 unset BBSERVER
138 bitbake --read conf/toaster-pre.conf --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 138 bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0
139 if [ $? -ne 0 ]; then 139 if [ $? -ne 0 ]; then
140 echo "Bitbake server start failed" 140 echo "Bitbake server start failed"
141 return 1 141 return 1
@@ -350,7 +350,6 @@ fi
350case $CMD in 350case $CMD in
351 start ) 351 start )
352 addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE 352 addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE
353 echo > ${BUILDDIR}/conf/toaster-pre.conf
354 if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then 353 if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
355 echo "Failed ${CMD}." 354 echo "Failed ${CMD}."
356 return 4 355 return 4