summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-08-17 13:38:09 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 13:06:41 +0100
commit1b6019086c4242c550b4e0551c7b5d206a0d52e1 (patch)
tree96899ed75fd714426d3bef9f65918ddb01dcf38a
parent35d9684f8dcee8194ad43cb342df21649683d8de (diff)
downloadpoky-1b6019086c4242c550b4e0551c7b5d206a0d52e1.tar.gz
populate_sdk_base.bbclass: fix SDK relocation issues
The problem appears if multiple setup environment scripts are found. In order to find only the script we're interested in, I removed globbing in matching pattern with ${REAL_MULTIMACH_TARGET_SYS} that will be expanded to the correct string. Also, fix a problem when changing the scripts/configs. The grep pattern matched also files that contained "text" in their name. (From OE-Core rev: d81768560676da201fd730ae3930b080ab8c5c75) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 0d1974141b..a1cb12a24a 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -154,7 +154,7 @@ echo "done"
154 154
155echo -n "Setting it up..." 155echo -n "Setting it up..."
156# fix environment paths 156# fix environment paths
157env_setup_script=$(find $target_sdk_dir -name "environment-setup*") 157env_setup_script=$(find $target_sdk_dir -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}")
158sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script 158sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
159 159
160# fix dynamic loader paths in all ELF SDK binaries 160# fix dynamic loader paths in all ELF SDK binaries
@@ -168,7 +168,7 @@ if [ $? -ne 0 ]; then
168fi 168fi
169 169
170# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc 170# replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc
171find $native_sysroot -type f -exec file '{}' \;|grep text|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" 171find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
172 172
173echo done 173echo done
174 174