diff options
author | Maanya Goenka <maanyagoenka@microsoft.com> | 2024-02-01 02:56:24 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-08 10:53:13 +0000 |
commit | 3ef63361b43a091ecea1fc4441544a280b769777 (patch) | |
tree | 0b697401e9b38746026a7da5e50c422899d16bda /meta/files | |
parent | e685773513dfc9f119b21e4194cfe5da1d8623d5 (diff) | |
download | poky-3ef63361b43a091ecea1fc4441544a280b769777.tar.gz |
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.
(From OE-Core rev: 8468f24e3e81d5248eb1424e43accd2ea8bf0568)
Signed-off-by: Maanya Goenka <maanyagoenka@microsoft.com>
Signed-off-by : Alejandro Hernandez Samaniego <alhe@linux.microsoft.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files')
-rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index cee9adbf39..e8ab357717 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 | |||
4 | fi | 4 | fi |
5 | 5 | ||
6 | # fix dynamic loader paths in all ELF SDK binaries | 6 | # fix dynamic loader paths in all ELF SDK binaries |
7 | # allow symlinks to be accessed via the find command too | ||
7 | native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"') | 8 | 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 -maxdepth 1 -name "ld-linux*") | 9 | dl_path=$($SUDO_EXEC find $native_sysroot/lib/ -maxdepth 1 -name "ld-linux*") |
9 | if [ "$dl_path" = "" ] ; then | 10 | if [ "$dl_path" = "" ] ; then |
10 | echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" | 11 | echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!" |
11 | exit 1 | 12 | exit 1 |