summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2013-11-01 15:58:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-04 10:55:54 (GMT)
commitb0c24033bb80ad92a58287a8c112ba97a6368beb (patch)
tree92483b11170cd7e6a431ecc5e307488f49ba6b11
parent25f50e24c72aa5f253ff5d9186637adb15a20123 (diff)
downloadpoky-b0c24033bb80ad92a58287a8c112ba97a6368beb.tar.gz
bitbake: 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 <cristiana.voicu@intel.com> (Bitbake rev: 029e868044989eda370340f8bf4200cfd2670fca) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/toaster12
1 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index cc631f6..d4715fa 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -36,7 +36,6 @@ function webserverKillAll()
36 done 36 done
37} 37}
38 38
39
40function webserverStartAll() 39function webserverStartAll()
41{ 40{
42 retval=0 41 retval=0
@@ -49,6 +48,14 @@ function webserverStartAll()
49 return $retval 48 return $retval
50} 49}
51 50
51# Helper functions to add a special configuration file
52
53function addtoConfiguration()
54{
55 echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
56 echo $1 >> ${BUILDDIR}/conf/$2
57}
58
52# define the stop command 59# define the stop command
53function stop_system() 60function stop_system()
54{ 61{
@@ -136,9 +143,10 @@ fi
136 143
137case $CMD in 144case $CMD in
138 start ) 145 start )
146 addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
139 webserverStartAll || return 4 147 webserverStartAll || return 4
140 unset BBSERVER 148 unset BBSERVER
141 bitbake --server-only -t xmlrpc -B localhost:8200 149 bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B localhost:8200
142 export BBSERVER=localhost:8200 150 export BBSERVER=localhost:8200
143 if [ $NOTOASTERUI == 0 ]; then # we start the TOASTERUI only if not inhibited 151 if [ $NOTOASTERUI == 0 ]; then # we start the TOASTERUI only if not inhibited
144 bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid 152 bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid