diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-12 15:08:12 +0000 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2015-12-27 23:03:15 -0800 |
| commit | 98215b9513212b7002d072afa763347520544ee0 (patch) | |
| tree | fa1c7dafb9bc830c08222ddcdef81ba46625aebb /meta | |
| parent | dded5f93d5650ebe5eb661a5cec698b1fa82e1ba (diff) | |
| download | openembedded-core-contrib-98215b9513212b7002d072afa763347520544ee0.tar.gz | |
classes/populate_sdk_ext: make it clear when SDK installation has failed
When SDK preparation fails:
* Insert an ERROR: in front of the error message
* Add an error message to the environment setup script
Hopefully this should make it more obvious when this happens.
Fixes [YOCTO #8658].
(From OE-Core master rev: 105df569b3b1982005c2edb37f4690f9ba6bde35)
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')
| -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 d368d4f820..e806d32a54 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -250,7 +250,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 && $target_sdk_dir/ext-sdk-prepare.sh $target_sdk_dir '${SDK_TARGETS}' >> $LOGFILE 2>&1" || { echo "SDK preparation failed: see $LOGFILE" ; 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 && $target_sdk_dir/ext-sdk-prepare.sh $target_sdk_dir '${SDK_TARGETS}' >> $LOGFILE 2>&1" || { echo "ERROR: SDK preparation failed: see $LOGFILE"; echo "printf 'ERROR: this SDK wasn't fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; } fi rm -f $target_sdk_dir/ext-sdk-prepare.sh echo done |