diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-08-17 13:38:09 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 13:06:09 +0100 |
| commit | d81768560676da201fd730ae3930b080ab8c5c75 (patch) | |
| tree | 9ac255d3daaebf37f63179434506888ef8e5694b | |
| parent | a11630f4eb667d78260cec09d2bafe621bad04e1 (diff) | |
| download | openembedded-core-d81768560676da201fd730ae3930b080ab8c5c75.tar.gz openembedded-core-d81768560676da201fd730ae3930b080ab8c5c75.tar.bz2 openembedded-core-d81768560676da201fd730ae3930b080ab8c5c75.zip | |
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.
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.bbclass | 4 |
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" echo -n "Setting it up..." # fix environment paths -env_setup_script=$(find $target_sdk_dir -name "environment-setup*") +env_setup_script=$(find $target_sdk_dir -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}") sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script # fix dynamic loader paths in all ELF SDK binaries @@ -168,7 +168,7 @@ if [ $? -ne 0 ]; then fi # replace ${SDKPATH} with the new prefix in all text files: configs/scripts/etc -find $native_sysroot -type f -exec file '{}' \;|grep text|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" +find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|xargs sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" echo done |