From 2837b110ae8fd5ff0ca3ac5959cadb7d4a5ce6cc Mon Sep 17 00:00:00 2001
From: Alexandru DAMIAN <alexandru.damian@intel.com>
Date: Mon, 13 Oct 2014 17:10:39 +0100
Subject: bitbake: toaster: change startup parameter passing to avoid race

We avoid a race between the setting the TOASTER_BRBE variable
and reading the variable in toaster ui by supplying the variable
at server startup time through the toaster.conf post-read file.

Additional small changes are included, including marking the
build request with the environment id of where the build took place.

(Bitbake rev: 7c333350418c4140e6c988c5272940f8057d327d)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/bin/toaster | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'bitbake/bin')

diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 75c7a076b1..6f5d98e331 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -83,8 +83,10 @@ function webserverStartAll()
 
 function addtoConfiguration()
 {
-        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
-        echo $1 >> ${BUILDDIR}/conf/$2
+        file=$1
+        shift
+        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$file
+        for var in "$@"; do echo $var >> ${BUILDDIR}/conf/$file; done
 }
 
 INSTOPSYSTEM=0
@@ -196,6 +198,7 @@ fi
 
 NOTOASTERUI=0
 WEBSERVER=1
+TOASTER_BRBE=""
 for param in $*; do
     case $param in
     noui )
@@ -204,6 +207,8 @@ for param in $*; do
     noweb )
             WEBSERVER=0
     ;;
+    brbe=* )
+            TOASTER_BRBE=$'\n'"TOASTER_BRBE=\""${param#*=}"\""
     esac
 done
 
@@ -228,7 +233,7 @@ fi
 case $CMD in
     start )
         start_success=1
-        addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
+        addtoConfiguration toaster.conf "INHERIT+=\"toaster buildhistory\"" $TOASTER_BRBE
         if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
             echo "Failed ${CMD}."
             return 4
@@ -248,10 +253,12 @@ case $CMD in
             # set fail safe stop system on terminal exit
             trap stop_system SIGHUP
             echo "Successful ${CMD}."
+            return 0
         else
             # failed start, do stop
             stop_system
             echo "Failed ${CMD}."
+            return 1
         fi
         # stop system on terminal exit
         set -o monitor
-- 
cgit v1.2.3-54-g00ecf