From 0870d9115546ad3b456af52ed45e46e637874a48 Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Wed, 5 Nov 2014 15:06:16 -0600 Subject: populate_sdk_base: improve POSIXLY_CORRECT compat The install script is sometimes called under POSIXLY_CORRECT. This requires two fixes be made: 1. `find -perm /0000` is a gnuism; replace with an equivalent boolean expression using `-perm -0000`. 2. POSIX grep requires that all options be passed on the command line before all files; otherwise, the options must be parsed as filenames. Signed-off-by: Richard Tollerton Signed-off-by: Ross Burton --- meta/files/toolchain-shar-template.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/files/toolchain-shar-template.sh b/meta/files/toolchain-shar-template.sh index 02035d4539..2578a34a2d 100644 --- a/meta/files/toolchain-shar-template.sh +++ b/meta/files/toolchain-shar-template.sh @@ -132,7 +132,8 @@ if [ "$dl_path" = "" ] ; then echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" exit 1 fi -executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111 -printf "'%h/%f' ") +executable_files=$($SUDO_EXEC find $native_sysroot -type f \ + \( -perm -0100 -o -perm -0010 -o -perm -0001 \) -printf "'%h/%f' ") tdir=`mktemp -d` if [ x$tdir = x ] ; then @@ -162,7 +163,7 @@ done # find out all perl scripts in $native_sysroot and modify them replacing the # host perl with SDK perl. -for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep "^#!.*perl" -l '{}' \;); do +for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep -l "^#!.*perl" '{}' \;); do $SUDO_EXEC sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script done -- cgit 1.2.3-korg