diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-28 17:55:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-29 09:57:54 +0100 |
commit | 7986adeac16550b33f65fded39a55f668e0e543f (patch) | |
tree | 3b5921319c7f962a2168d6b66e58ecf08fa3f593 /meta/classes | |
parent | 15e5661d6341004ebc4d3492acb48f73dd86b96e (diff) | |
download | openembedded-core-7986adeac16550b33f65fded39a55f668e0e543f.tar.gz openembedded-core-7986adeac16550b33f65fded39a55f668e0e543f.tar.bz2 openembedded-core-7986adeac16550b33f65fded39a55f668e0e543f.zip |
populate_sdk_base: Fix grep command usage on old hosts
"man grep" on centos:
-R, -r, --recursive
Read all files under each directory, recursively; this is equivalent to the -d recurse option.
"man grep" on a more recent ubuntu system:
-r, --recursive
Read all files under each directory, recursively, following symbolic links only if they are on the command line. This
is equivalent to the -d recurse option.
So we have an issue when the SDK installer (even with
buildtools-tarball) is used on old hosts since it may try and
dereference paths which it should not. This is caused by differences in
the behaviour of grep -r on older systems.
The fix is to wrap this in find so that only real files are found (as
elsewhere in the script.
[YOCTO #6577]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 893afbbb3d..06112dcf81 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -285,7 +285,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 grep "^#!.*perl" -rl $native_sysroot); do +for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep "^#!.*perl" -l '{}' \;); 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 |