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:58:27 +0100 |
commit | 2d1660112e54653f7bb763939d0416472c49fe01 (patch) | |
tree | 097f73c3458ab6704037db0cafa564f24c647b13 | |
parent | d73810941510bbbe1dcd3536ac7e82c0e9f135bc (diff) | |
download | poky-2d1660112e54653f7bb763939d0416472c49fe01.tar.gz |
populate_sdk_base: Fix grep command usage on old hosts1.7_M2
"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]
(From OE-Core rev: 7986adeac16550b33f65fded39a55f668e0e543f)
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>
-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 | |||
285 | 285 | ||
286 | # find out all perl scripts in $native_sysroot and modify them replacing the | 286 | # find out all perl scripts in $native_sysroot and modify them replacing the |
287 | # host perl with SDK perl. | 287 | # host perl with SDK perl. |
288 | for perl_script in $($SUDO_EXEC grep "^#!.*perl" -rl $native_sysroot); do | 288 | for perl_script in $($SUDO_EXEC find $native_sysroot -type f -exec grep "^#!.*perl" -l '{}' \;); do |
289 | $SUDO_EXEC sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ | 289 | $SUDO_EXEC sed -i -e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" -e \ |
290 | "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script | 290 | "s: /usr/bin/perl: /usr/bin/env perl:g" $perl_script |
291 | done | 291 | done |