diff options
author | Gary Thomas <gary@mlbassoc.com> | 2014-08-11 14:50:35 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:21:53 +0100 |
commit | eed22703c28b3dbb78baed860e22b9f137c230fd (patch) | |
tree | 1aa95ff4219620b7a84e0d8aa1bc326786b974c1 | |
parent | 298de655f6bba7921a795b54a6c628fb009debf1 (diff) | |
download | poky-eed22703c28b3dbb78baed860e22b9f137c230fd.tar.gz |
toolchain-shar-template.sh: Limit xargs command line
It's possible to generate a command line in the relocate_sdk.sh script
which is too long (long paths, many files). This change limits the
xargs command line by breaking it up into smaller pieces.
One necessary side effect is that the -0 option is no longer used as it
doesn't seem to work properly with -n, so the file name arguments are
now quoted explicitly rather than \0 terminated.
(From OE-Core rev: 25711dfe31ae600bfad9680e901ff5dec76093a1)
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/files/toolchain-shar-template.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh index a6207bbd4d..a37d6ff786 100644 --- a/meta/files/toolchain-shar-template.sh +++ b/meta/files/toolchain-shar-template.sh | |||
@@ -153,7 +153,7 @@ if [ $relocate = 1 ] ; then | |||
153 | fi | 153 | fi |
154 | 154 | ||
155 | # replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc | 155 | # replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc |
156 | $SUDO_EXEC find $native_sysroot -type f -exec file '{}' \;|grep ":.*\(ASCII\|script\|source\).*text"|awk -F':' '{printf "%s\0", $1}'|$SUDO_EXEC xargs -0 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" | 156 | $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 | 157 | ||
158 | # change all symlinks pointing to @SDKPATH@ | 158 | # change all symlinks pointing to @SDKPATH@ |
159 | for l in $($SUDO_EXEC find $native_sysroot -type l); do | 159 | for l in $($SUDO_EXEC find $native_sysroot -type l); do |