[oe-commits] Roy Li : Revert "populate_sdk: verify executable or dynamically linked library"

git at git.openembedded.org git at git.openembedded.org
Tue Jun 17 08:00:00 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: fc9603d7d7042efe8941172091cca8578bdde15b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=fc9603d7d7042efe8941172091cca8578bdde15b

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Jun 17 14:00:27 2014 +0800

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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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 10d04ed..35d837d 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



More information about the Openembedded-commits mailing list