summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2014-06-17 14:00:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-17 08:56:37 +0100
commitfc9603d7d7042efe8941172091cca8578bdde15b (patch)
treeeea2f8b47ecc5c656d53f47060e1e2544d3256ec
parent3b973f1c9c9ee3fbe64903036ad93eb9e928b185 (diff)
downloadopenembedded-core-contrib-fc9603d7d7042efe8941172091cca8578bdde15b.tar.gz
openembedded-core-contrib-fc9603d7d7042efe8941172091cca8578bdde15b.tar.bz2
openembedded-core-contrib-fc9603d7d7042efe8941172091cca8578bdde15b.zip
Revert "populate_sdk: verify executable or dynamically linked library"
It is introduced a bug, since The return of "file ld-linux-x86-64.so.*" does not include "dynamically linked" in redhat 5.9/6.0(32 bit), and lead to that ld-linux-x86-64.so.* is not in executable file list. Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 10d04edc63..35d837d5df 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -254,7 +254,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 -exec file '{}' \;| grep "\(executable\|dynamically linked\)" | cut -f 1 -d ':')
+executable_files=$($SUDO_EXEC find $native_sysroot -type f -perm /111)
tdir=`mktemp -d`
if [ x$tdir = x ] ; then