summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-01-08 13:15:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-08 22:34:36 +0000
commit3c3766927212853dfd195185caaa0fc951f049c8 (patch)
tree67ad0fcb09294cda67f039999716df91cc9e697e /bitbake/bin
parented9fa17467ad8f41c654187eb840d4b4e15d262d (diff)
downloadpoky-3c3766927212853dfd195185caaa0fc951f049c8.tar.gz
bitbake: toaster: write pre-read conf file for build variables
We change the setting of variables from directly injection into the set-up cooker to writing a conf file that is pre-read on bitbake server startup. This is needed because the injection can only happen after the variable set is parsed, and the variables already inferred, so setting up variables happens too late. [YOCTO #7045] (Bitbake rev: 854f680b5b9d2d0fa796af84cb1218545fbfc55a) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster6
1 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 7511012552..6969bf7f82 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -251,7 +251,11 @@ case $CMD in
251 return 4 251 return 4
252 fi 252 fi
253 unset BBSERVER 253 unset BBSERVER
254 bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 254 PREREAD=""
255 if [ -e conf/toaster-pre.conf ]; then
256 PREREAD="--read conf/toaster-pre.conf"
257 fi
258 bitbake $PREREAD --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0
255 if [ $? -ne 0 ]; then 259 if [ $? -ne 0 ]; then
256 start_success=0 260 start_success=0
257 echo "Bitbake server start failed" 261 echo "Bitbake server start failed"