summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-11-13 06:34:18 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:06:31 +0000
commit104990923f82d129a0fc8e6cd5bf0224751d5d03 (patch)
tree40827ab89b0a898e964811789666f78d2f595acf
parentfa17b9ea435f5c49e3bea56524152b21d915d464 (diff)
downloadopenembedded-core-contrib-104990923f82d129a0fc8e6cd5bf0224751d5d03.tar.gz
openembedded-core-contrib-104990923f82d129a0fc8e6cd5bf0224751d5d03.tar.bz2
openembedded-core-contrib-104990923f82d129a0fc8e6cd5bf0224751d5d03.zip
toolchain-shar-template.sh: fix the text files in the top dir
It only fixed the text files in native_sysroot, but there might be some files in the top installed dir (whose var name is target_sdk_dir in the code) which are also needed to be fixed. It used "find $native_sysroot", now also "find $target_sdk_dir -maxdepth 1", and split the long line into small ones. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/files/toolchain-shar-template.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index 2578a34a2d..0d679a66db 100644
--- a/meta/files/toolchain-shar-template.sh
+++ b/meta/files/toolchain-shar-template.sh
@@ -154,7 +154,12 @@ if [ $relocate = 1 ] ; then
fi
# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc
-$SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\|source\).*text"|awk -F':' '{printf "\"%s\"\n", $1}'|$SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
+for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do
+ $SUDO_EXEC find $replace -type f -exec file '{}' \; | \
+ grep ":.*\(ASCII\|script\|source\).*text" | \
+ awk -F':' '{printf "\"%s\"\n", $1}' | \
+ $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
+done
# change all symlinks pointing to @SDKPATH@
for l in $($SUDO_EXEC find $native_sysroot -type l); do