diff options
| author | Christian Eggers <ceggers@arri.de> | 2022-02-10 11:28:10 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-23 23:43:42 +0000 |
| commit | b34672df173c3afee7849eb3f21e882a03bbdd63 (patch) | |
| tree | bb3394cd957a50c989ea10db3328c91fad4d5f9d | |
| parent | a4501bdd1a1d3abaf9a6fa33b7c88b2b8273d918 (diff) | |
| download | poky-b34672df173c3afee7849eb3f21e882a03bbdd63.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: c95695c220a1bd1984920b893418d6822b75ebac)
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>
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 |
