summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/files/ext-sdk-prepare.py2
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() {
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
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():
59 for line in f: 59 for line in f:
60 logf.write(line) 60 logf.write(line)
61 if ret: 61 if ret:
62 print('ERROR: SDK preparation failed: see %s' % logfile) 62 print('ERROR: SDK preparation failed: error log written to %s' % logfile)
63 return ret 63 return ret
64 64
65if __name__ == "__main__": 65if __name__ == "__main__":