summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-11-13 14:34:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:08:13 (GMT)
commit9ca077710f95da8a85f343525a2a44d3b3e4001d (patch)
tree7b6d35e9ec20611b5957b213becd26524050151a
parent71df8a408f0862b9ddf9abfb4a0da6b67e053936 (diff)
downloadpoky-9ca077710f95da8a85f343525a2a44d3b3e4001d.tar.gz
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. (From OE-Core rev: 104990923f82d129a0fc8e6cd5bf0224751d5d03) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 2578a34..0d679a6 100644
--- a/meta/files/toolchain-shar-template.sh
+++ b/meta/files/toolchain-shar-template.sh
@@ -154,7 +154,12 @@ if [ $relocate = 1 ] ; then
154fi 154fi
155 155
156# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc 156# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc
157$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" 157for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do
158 $SUDO_EXEC find $replace -type f -exec file '{}' \; | \
159 grep ":.*\(ASCII\|script\|source\).*text" | \
160 awk -F':' '{printf "\"%s\"\n", $1}' | \
161 $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
162done
158 163
159# change all symlinks pointing to @SDKPATH@ 164# change all symlinks pointing to @SDKPATH@
160for l in $($SUDO_EXEC find $native_sysroot -type l); do 165for l in $($SUDO_EXEC find $native_sysroot -type l); do