diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-11-13 06:34:18 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-20 14:08:13 +0000 |
| commit | 9ca077710f95da8a85f343525a2a44d3b3e4001d (patch) | |
| tree | 7b6d35e9ec20611b5957b213becd26524050151a | |
| parent | 71df8a408f0862b9ddf9abfb4a0da6b67e053936 (diff) | |
| download | poky-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.sh | 7 |
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 | |||
| 154 | fi | 154 | fi |
| 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" | 157 | for 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" | ||
| 162 | done | ||
| 158 | 163 | ||
| 159 | # change all symlinks pointing to @SDKPATH@ | 164 | # change all symlinks pointing to @SDKPATH@ |
| 160 | for l in $($SUDO_EXEC find $native_sysroot -type l); do | 165 | for l in $($SUDO_EXEC find $native_sysroot -type l); do |
