summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-07 00:15:43 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 15:41:45 +0000
commitd44dcd77ab84857b5d16b9fc00deefeb3f14a8c3 (patch)
treeeaf5c0921a5ce144b813256635c90143b0aa7f65
parentd11051c489b425d331edc385300e350a7d7e8eea (diff)
downloadpoky-d44dcd77ab84857b5d16b9fc00deefeb3f14a8c3.tar.gz
classes/populate_sdk_ext: fix cascading from preparation failure
During extensible SDK installtion, if the build system preparation step fails we try to put something at the end of the environment setup script to show an error when it is sourced, in case the user doesn't realise that the partially-installed SDK is broken. However, an apostrophe in the message (actually a single quote) appears to terminate the string and therefore breaks the command. Drop it to avoid that. (From OE-Core rev: 21e591d182e24c399ae010a8eff9b89947061a46) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index c30181ab4d..be47a774d7 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -250,7 +250,7 @@ sdk_ext_postinst() {
250 # current working directory when first ran, nor will it set $1 when 250 # current working directory when first ran, nor will it set $1 when
251 # sourcing a script. That is why this has to look so ugly. 251 # sourcing a script. That is why this has to look so ugly.
252 LOGFILE="$target_sdk_dir/preparing_build_system.log" 252 LOGFILE="$target_sdk_dir/preparing_build_system.log"
253 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 ; } 253 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 was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
254 fi 254 fi
255 rm -f $target_sdk_dir/ext-sdk-prepare.sh 255 rm -f $target_sdk_dir/ext-sdk-prepare.sh
256 echo done 256 echo done