summaryrefslogtreecommitdiff
path: root/meta/files
diff options
context:
space:
mode:
authorGary Thomas <gary@mlbassoc.com>2014-08-11 14:50:35 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:19:55 +0100
commit25711dfe31ae600bfad9680e901ff5dec76093a1 (patch)
tree13cc7f50981805111235e1e56b7a965be81b6300 /meta/files
parent9287029656b498b1cb23ed22ae8e78e652615383 (diff)
downloadopenembedded-core-25711dfe31ae600bfad9680e901ff5dec76093a1.tar.gz
openembedded-core-25711dfe31ae600bfad9680e901ff5dec76093a1.tar.bz2
openembedded-core-25711dfe31ae600bfad9680e901ff5dec76093a1.zip
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. Signed-off-by: Gary Thomas <gary@mlbassoc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files')
-rw-r--r--meta/files/toolchain-shar-template.sh2
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
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\0", $1}'|$SUDO_EXEC xargs -0 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g"
+$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"
# change all symlinks pointing to @SDKPATH@
for l in $($SUDO_EXEC find $native_sysroot -type l); do