diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-08-11 16:45:07 +1200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 10:35:41 +0100 |
commit | 99d109cdbc1dd3053bbb9f177bb14251745d49f0 (patch) | |
tree | 8f9640f830a7859a4d21f329f1b0d647b38688e3 /meta/classes/populate_sdk_ext.bbclass | |
parent | 64ffbd4869fecc053cd158c2c70cf6575c31245e (diff) | |
download | poky-99d109cdbc1dd3053bbb9f177bb14251745d49f0.tar.gz |
classes/populate_sdk_ext: drop duplicated error message
The preparation script itself prints out an error on failure, and we
aren't redirecting its output anymore, so we no longer need to print out
a message here when it fails. At the same time, make the message printed
out by the script a little clearer - we're just writing the log out to
the file, we shouldn't give the user an expectation that there will be
extra details in there (other than the output produced by
oe-init-build-env there won't be).
(From OE-Core rev: 80dfaf40e087b34d6360188df372c1c3805a00bd)
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>
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index f1ae7c1236..b52ad41d3d 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -578,7 +578,7 @@ sdk_ext_postinst() { | |||
578 | # current working directory when first ran, nor will it set $1 when | 578 | # current working directory when first ran, nor will it set $1 when |
579 | # sourcing a script. That is why this has to look so ugly. | 579 | # sourcing a script. That is why this has to look so ugly. |
580 | LOGFILE="$target_sdk_dir/preparing_build_system.log" | 580 | LOGFILE="$target_sdk_dir/preparing_build_system.log" |
581 | 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 && python $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "ERROR: SDK preparation failed: see $LOGFILE for a slightly more detailed log"; echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; } | 581 | 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 && python $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; } |
582 | rm $target_sdk_dir/ext-sdk-prepare.py | 582 | rm $target_sdk_dir/ext-sdk-prepare.py |
583 | fi | 583 | fi |
584 | echo done | 584 | echo done |