From 3c3766927212853dfd195185caaa0fc951f049c8 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Thu, 8 Jan 2015 13:15:11 +0000 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bitbake/bin') 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 return 4 fi unset BBSERVER - bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 + PREREAD="" + if [ -e conf/toaster-pre.conf ]; then + PREREAD="--read conf/toaster-pre.conf" + fi + bitbake $PREREAD --postread conf/toaster.conf --server-only -t xmlrpc -B 0.0.0.0:0 if [ $? -ne 0 ]; then start_success=0 echo "Bitbake server start failed" -- cgit v1.2.3-54-g00ecf