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].
Signed-off-by: Paul Eggleton <paul.eggle...@linux.intel.com>
---
meta/classes/populate_sdk_ext.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass
b/meta/classes/populate_sdk_ext.bbclass
index d368d4f..e806d32 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
--
2.1.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
