From: Gary Thomas <gary@mlbassoc.com>
Date: Mon, 11 Aug 2014 20:50:35 +0000 (-0600)
Subject: toolchain-shar-template.sh: Limit xargs command line
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~32746
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25711dfe31ae600bfad9680e901ff5dec76093a1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh
index a6207bbd4df..a37d6ff786f 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