From: Paul Eggleton <[email protected]>

Use a variable for the log file which includes the full path; this is
not only neater but avoids us writing the first part (the output of
oe-init-build-env) to a file in another directory since we are
changing directory as part of this subshell.

(From OE-Core master rev: 001af71752a9e9aab460cbd49ed049e1eb726295)

Signed-off-by: Paul Eggleton <[email protected]>
Signed-off-by: Ross Burton <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
---
 meta/classes/populate_sdk_ext.bbclass |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/populate_sdk_ext.bbclass 
b/meta/classes/populate_sdk_ext.bbclass
index 249ec36..d368d4f 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -249,7 +249,8 @@ sdk_ext_postinst() {
                # dash which is /bin/sh on Ubuntu will not preserve the
                # current working directory when first ran, nor will it set $1 
when
                # sourcing a script. That is why this has to look so ugly.
-               sh -c ". buildtools/environment-setup* > 
preparing_build_system.log && cd $target_sdk_dir/`dirname 
${oe_init_build_env_path}` && set $target_sdk_dir && . 
$target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> 
preparing_build_system.log && $target_sdk_dir/ext-sdk-prepare.sh 
$target_sdk_dir '${SDK_TARGETS}' >> preparing_build_system.log 2>&1" || { echo 
"SDK preparation failed: see `pwd`/preparing_build_system.log" ; exit 1 ; }
+               LOGFILE="$target_sdk_dir/preparing_build_system.log"
+               sh -c ". buildtools/environment-setup* > $LOGFILE && cd 
$target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . 
$target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && 
$target_sdk_dir/ext-sdk-prepare.sh $target_sdk_dir '${SDK_TARGETS}' >> $LOGFILE 
2>&1" || { echo "SDK preparation failed: see $LOGFILE" ; exit 1 ; }
        fi
        rm -f $target_sdk_dir/ext-sdk-prepare.sh
        echo done
-- 
1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to