diff options
author | Christian Eggers <ceggers@arri.de> | 2022-02-14 11:50:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-20 15:32:27 +0000 |
commit | 798f2bef8d29c77cb545c4b7752bb78854471f0f (patch) | |
tree | b70f5c903fda6f4f4e75c23138cf37ac60d07fe2 /meta | |
parent | ebb15c1063d85d3375e205feb59e7c45321a0b0a (diff) | |
download | poky-798f2bef8d29c77cb545c4b7752bb78854471f0f.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.
(From OE-Core rev: d57b748ef22d75b863356a97bfc585e1e967a44a)
Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 | |||
5 | 5 | ||
6 | # fix dynamic loader paths in all ELF SDK binaries | 6 | # fix dynamic loader paths in all ELF SDK binaries |
7 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') | 7 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') |
8 | dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") | 8 | dl_path=$($SUDO_EXEC find $native_sysroot/lib -maxdepth 1 -name "ld-linux*") |
9 | if [ "$dl_path" = "" ] ; then | 9 | if [ "$dl_path" = "" ] ; then |
10 | echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" | 10 | echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" |
11 | exit 1 | 11 | exit 1 |