Patchwork [2/2] Revert "populate_sdk: verify executable or dynamically linked library" This reverts commit c9d56308bfa9ee7f4a9b22eae86390626ddc1c35.

login
register
mail settings
Submitter rongqing.li@windriver.com
Date June 16, 2014, 6:46 a.m.
Message ID <1402901171-14424-2-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/73837/
State Accepted
Commit 317224e0b267cc15a15003004e4855bf631c4224
Headers show

Comments

rongqing.li@windriver.com - June 16, 2014, 6:46 a.m.
From: Roy Li <rongqing.li@windriver.com>

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.
---
 meta/classes/populate_sdk_base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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