From 029e868044989eda370340f8bf4200cfd2670fca Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 1 Nov 2013 15:58:35 +0000 Subject: toaster: enable required classes in the toaster startup script In order to use toaster, now you have to set INHERIT+="toaster buildhistory" To keep it simple, I've done some changes in order to automate it. When toaster is started, this line is added to a new file called toaster.conf. This file is passed to the bitbake server with the --postread parameter. Based on a patch by Cristiana Voicu Signed-off-by: Alexandru DAMIAN Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bin/toaster | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/toaster b/bin/toaster index cc631f6f5..d4715fa67 100755 --- a/bin/toaster +++ b/bin/toaster @@ -36,7 +36,6 @@ function webserverKillAll() done } - function webserverStartAll() { retval=0 @@ -49,6 +48,14 @@ function webserverStartAll() return $retval } +# Helper functions to add a special configuration file + +function addtoConfiguration() +{ + echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2 + echo $1 >> ${BUILDDIR}/conf/$2 +} + # define the stop command function stop_system() { @@ -136,9 +143,10 @@ fi case $CMD in start ) + addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf webserverStartAll || return 4 unset BBSERVER - bitbake --server-only -t xmlrpc -B localhost:8200 + bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B localhost:8200 export BBSERVER=localhost:8200 if [ $NOTOASTERUI == 0 ]; then # we start the TOASTERUI only if not inhibited bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid -- cgit 1.2.3-korg