diff options
| author |   Christian Eggers <ceggers@arri.de> | 2022-02-10 11:28:10 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-02-19 09:59:34 -1000 |
| commit | c95695c220a1bd1984920b893418d6822b75ebac (patch) | |
| tree | 47b32b43726628d764a83d2e56a2bb7363db9878 | |
| parent | a28a6d31e84f59c4cfe47ddbd28bbe258d5d094f (diff) | |
| download | openembedded-core-contrib-c95695c220a1bd1984920b893418d6822b75ebac.tar.gz | |
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.
Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit baec04b936ab6b3d2039978fd568c3824cd0a501)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index 3ece04db0a..cee9adbf39 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -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 |