Patchwork [bitbake-devel,8/8] toaster: enable required classes in the toaster startup script

login
register
mail settings
Submitter Paul Eggleton
Date Nov. 1, 2013, 3:58 p.m.
Message ID <0e6507dc8b9438d1430bdaa2dbee485425bce6b7.1383321482.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/60993/
State Accepted
Commit 029e868044989eda370340f8bf4200cfd2670fca
Headers show

Comments

Paul Eggleton - Nov. 1, 2013, 3:58 p.m.
From: Alexandru DAMIAN <alexandru.damian@intel.com>

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 <cristiana.voicu@intel.com>

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bin/toaster | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Patch

diff --git a/bin/toaster b/bin/toaster
index cc631f6..d4715fa 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