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:32:16 +0100 |
| commit | 80dfaf40e087b34d6360188df372c1c3805a00bd (patch) | |
| tree | e5c413e0b1ed8ac276537ef2676d516f92dd32d5 | |
| parent | 6e6999a920b913ad9fdd2751100219c07cd14e54 (diff) | |
| download | openembedded-core-80dfaf40e087b34d6360188df372c1c3805a00bd.tar.gz openembedded-core-80dfaf40e087b34d6360188df372c1c3805a00bd.tar.bz2 openembedded-core-80dfaf40e087b34d6360188df372c1c3805a00bd.zip | |
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).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 | ||||
| -rw-r--r-- | meta/files/ext-sdk-prepare.py | 2 |
2 files changed, 2 insertions, 2 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() { # current working directory when first ran, nor will it set $1 when # sourcing a script. That is why this has to look so ugly. 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 && 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 ; } + 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 ; } rm $target_sdk_dir/ext-sdk-prepare.py fi echo done diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py index 8b15982843..78c1d16304 100644 --- a/meta/files/ext-sdk-prepare.py +++ b/meta/files/ext-sdk-prepare.py @@ -59,7 +59,7 @@ def main(): for line in f: logf.write(line) if ret: - print('ERROR: SDK preparation failed: see %s' % logfile) + print('ERROR: SDK preparation failed: error log written to %s' % logfile) return ret if __name__ == "__main__": |