From: Ed Bartosh Date: Wed, 2 Dec 2015 18:02:56 +0000 (-0800) Subject: bitbake: toaster: stop using toaster-pre.conf X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4186f5b04e6fc2e6e42254f03c19c7f84e3d944c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: brian avery Signed-off-by: Richard Purdie --- diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index c89e0157065..3b5b7f868b0 100755 --- a/bitbake/bin/toaster +++ b/bitbake/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