From: Paul Eggleton Date: Fri, 22 Jan 2016 11:59:53 +0000 (+1300) Subject: classes/populate_sdk_ext: drop ext-sdk-prepare.py when installing X-Git-Tag: 2016-4~1315 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=037ea78b0c3de01f87bbe06a1b88a162b2b40496;p=openembedded-core.git classes/populate_sdk_ext: drop ext-sdk-prepare.py when installing At the end of the extensible SDK installation, if we've successfully prepared the build system then we don't need ext-sdk-prepare.py. I had thought earlier that this would be used when updating, but a different mechanism was needed there so this script isn't used for that. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index bb8831bf31..2944576398 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -304,6 +304,7 @@ sdk_ext_postinst() { # 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 '${SDK_INSTALL_TARGETS}' >> $LOGFILE 2>&1" || { echo "ERROR: SDK preparation failed: see $LOGFILE"; 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 }