summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_ext.bbclass
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-15 15:51:40 +0000
commit00ff950d3cfa27b2cc2dc0407b2c65a271a6d693 (patch)
treed90c095e9d035be2913fb63e863e54e5badbfdbb /meta/classes/populate_sdk_ext.bbclass
parent22446c6f44fd9603c842ed2ee947545c1f4bdf24 (diff)
downloadpoky-00ff950d3cfa27b2cc2dc0407b2c65a271a6d693.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 master rev: 21e591d182e24c399ae010a8eff9b89947061a46) (From OE-Core rev: 91326ede91ff7b820ec60ec642927cc223cae81f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-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 f5597f4782..46c39f5b75 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -247,7 +247,7 @@ sdk_ext_postinst() {
247 # current working directory when first ran, nor will it set $1 when 247 # current working directory when first ran, nor will it set $1 when
248 # sourcing a script. That is why this has to look so ugly. 248 # sourcing a script. That is why this has to look so ugly.
249 LOGFILE="$target_sdk_dir/preparing_build_system.log" 249 LOGFILE="$target_sdk_dir/preparing_build_system.log"
250 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 ; } 250 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 ; }
251 fi 251 fi
252 rm -f $target_sdk_dir/ext-sdk-prepare.sh 252 rm -f $target_sdk_dir/ext-sdk-prepare.sh
253 echo done 253 echo done