From: Maanya Goenka Date: Thu, 1 Feb 2024 02:56:24 +0000 (+0000) Subject: toolchain-shar-relocate: allow 'find' access to libraries in symlinked directories X-Git-Tag: uninative-4.4~228 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8468f24e3e81d5248eb1424e43accd2ea8bf0568;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git toolchain-shar-relocate: allow 'find' access to libraries in symlinked directories If the '/' is not added to the end of the dynamic loader path, only directories that are not symlinks will be looked into for libraries such as ld-linux*, so the slash is added to allow the 'find' command to have symlinked directory access too. Signed-off-by: Maanya Goenka Signed-off-by : Alejandro Hernandez Samaniego Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index cee9adbf399..e8ab357717f 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -4,8 +4,9 @@ if ! xargs --version > /dev/null 2>&1; then fi # fix dynamic loader paths in all ELF SDK binaries +# allow symlinks to be accessed via the find command too 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 -maxdepth 1 -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