diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-12 15:00:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:28 +0000 |
commit | dee9fbe0440dca446ce13fda17c1f3bc42d880fe (patch) | |
tree | 19ec8067d5c906b6440c3a960bb67aee01b1b8e0 | |
parent | d001d46d171dfd89ef758ea3bdb02e01ff4b2abb (diff) | |
download | poky-dee9fbe0440dca446ce13fda17c1f3bc42d880fe.tar.gz |
classes/populate_sdk_ext: tidy up preparation log file writing
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)
(From OE-Core rev: dded5f93d5650ebe5eb661a5cec698b1fa82e1ba)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 249ec363db..d368d4f820 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -249,7 +249,8 @@ sdk_ext_postinst() { | |||
249 | # dash which is /bin/sh on Ubuntu will not preserve the | 249 | # dash which is /bin/sh on Ubuntu will not preserve the |
250 | # current working directory when first ran, nor will it set $1 when | 250 | # current working directory when first ran, nor will it set $1 when |
251 | # sourcing a script. That is why this has to look so ugly. | 251 | # sourcing a script. That is why this has to look so ugly. |
252 | 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 ; } | 252 | LOGFILE="$target_sdk_dir/preparing_build_system.log" |
253 | 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 ; } | ||
253 | fi | 254 | fi |
254 | rm -f $target_sdk_dir/ext-sdk-prepare.sh | 255 | rm -f $target_sdk_dir/ext-sdk-prepare.sh |
255 | echo done | 256 | echo done |