Skip to contentSkip to conversation

sdk: fix search for dynamic loader

PATCH New Christian Eggers 1 participant 1 message Feb 14, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sdk: fix search for dynamic loader

if the package "nativesdk-glibc-dbg" is installed as part of the SDK, the existing search expression finds two files:

$OECORE_NATIVE_SYSROOT/lib/.debug/ld-linux-x86-64.so.2 $OECORE_NATIVE_SYSROOT/lib/ld-linux-x86-64.so.2

The generated relocate_sdk.sh shell script contains then an extra newline and segfaults during SDK relocation.

Limit the search depth to 1, to avoid finding the file in the .debug directory.

---
 meta/files/toolchain-shar-relocate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/files/toolchain-shar-relocate.sh +1 -1
index 3ece04db0a4a..cee9adbf399c 100644
@@ -5,7 +5,7 @@ fi
 
 # fix dynamic loader paths in all ELF SDK binaries
 native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"')
-dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*")
+dl_path=$($SUDO_EXEC find $native_sysroot/lib -maxdepth 1 -name "ld-linux*")
 if [ "$dl_path" = "" ] ; then
 	echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!"
 	exit 1
Signature · 1 line
2.34.1