diff options
| author | Christian Eggers <ceggers@arri.de> | 2022-02-14 11:49:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-24 11:12:39 +0000 |
| commit | 30e330c259cb6304e31311ba12f87361d901ef44 (patch) | |
| tree | 7bc39dc645230cd990832c7da4e8e1f208949841 | |
| parent | 0ca6f8f34604eaf47b749d10abcb95d17e58cfe9 (diff) | |
| download | poky-30e330c259cb6304e31311ba12f87361d901ef44.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: 950536bc9cc78ab3c58586e67acb602cd78e3dac)
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>
| -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 |
