summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-22 17:21:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:53:11 +0100
commitb853dded4103e971f0a802e1a270c301037891ba (patch)
tree92927a2ae5715c175f20c11d40f719b4bede1afe
parent374e1fed0ee2be830d4d721f820e30bb5494e003 (diff)
downloadpoky-b853dded4103e971f0a802e1a270c301037891ba.tar.gz
classes/populate_sdk_ext: fix missing environment settings if running installer with sh
If you ran the extensible SDK installer file with sh (instead of bash), then the additional call to buildtools environment setup, extension of PATH to support running devtool, and setting of OE_SKIP_SDK_CHECK weren't being added to the end of the script. This is because apparently bash is happy to expand wildcards in the target of a redirection, but bash running in POSIX sh mode won't (although it apparently does work on the sh command line rather than within a script run as an argument to sh). In any case using a wildcard here is a bit of a crutch which we don't need, so replace it with the proper path to the environment setup script. (From OE-Core rev: ba0f6b6ec32275329ebbb7c27f661c027b7a921d) 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.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 4ef8838e35..15cae71496 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -222,14 +222,15 @@ sdk_ext_postinst() {
222 222
223 # Make sure when the user sets up the environment, they also get 223 # Make sure when the user sets up the environment, they also get
224 # the buildtools-tarball tools in their path. 224 # the buildtools-tarball tools in their path.
225 echo ". $target_sdk_dir/buildtools/environment-setup*" >> $target_sdk_dir/environment-setup* 225 env_setup_script="$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"
226 echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script
226 227
227 # Allow bitbake environment setup to be ran as part of this sdk. 228 # Allow bitbake environment setup to be ran as part of this sdk.
228 echo "export OE_SKIP_SDK_CHECK=1" >> $target_sdk_dir/environment-setup* 229 echo "export OE_SKIP_SDK_CHECK=1" >> $env_setup_script
229 230
230 # A bit of another hack, but we need this in the path only for devtool 231 # A bit of another hack, but we need this in the path only for devtool
231 # so put it at the end of $PATH. 232 # so put it at the end of $PATH.
232 echo "export PATH=\$PATH:$target_sdk_dir/sysroots/${SDK_SYS}/${bindir_nativesdk}" >> $target_sdk_dir/environment-setup* 233 echo "export PATH=\$PATH:$target_sdk_dir/sysroots/${SDK_SYS}/${bindir_nativesdk}" >> $env_setup_script
233 234
234 # For now this is where uninative.bbclass expects the tarball 235 # For now this is where uninative.bbclass expects the tarball
235 mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname ${oe_init_build_env_path}` 236 mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname ${oe_init_build_env_path}`