From 32c7150b046df43f9d69d1a7d5eac2c71d137aa0 Mon Sep 17 00:00:00 2001 From: yzhu1 Date: Tue, 26 Nov 2013 08:38:28 +0000 Subject: [PATCH] populate_sdk: verify executable or dynamically linked library When toolchain directory is changed to execute mode, some non-executable files or empty files are sorted. This will result in some errors. Thus when sorting executable files or dynamically linked library, additional conditions are to exclude non-executable files or empty files. (From OE-Core master rev: c9d56308bfa9ee7f4a9b22eae86390626ddc1c35) (From OE-Core rev: 7565b6220e596687ee97cf06256a7065a55bb297) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index b7ea85159c..29890e38c9 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -253,7 +253,7 @@ 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) +executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111 -exec file '{}' \;| grep "\(executable\|dynamically linked\)" | cut -f 1 -d ':') tdir=`mktemp -d` if [ x$tdir = x ] ; then