From 8824da319b17c3a401b68962b18ef09ef4625b15 Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Thu, 9 May 2024 14:28:17 +0100 Subject: sdk: Fix path length limit to match reserved size There were two different interpreter lengths in use, make them match. (From OE-Core rev: 98119e3f452ebf6cb5f17049aef3a9a3ef7116c8) Signed-off-by: Richard Purdie (cherry picked from commit b175f9cdc3d87bef5c89cc337c2a7e2674732b29) Signed-off-by: Steve Sakoman --- meta/files/toolchain-shar-extract.sh | 4 +++- meta/recipes-core/meta/uninative-tarball.bb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 4386b985bb..89d30005fd 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -164,7 +164,9 @@ else fi # limit the length for target_sdk_dir, ensure the relocation behaviour in relocate_sdk.py has right result. -if [ ${#target_sdk_dir} -gt 2048 ]; then +# This is due to ELF interpreter being set to 'a'*1024 in +# meta/recipes-core/meta/uninative-tarball.bb +if [ ${#target_sdk_dir} -gt 1024 ]; then echo "Error: The target directory path is too long!!!" exit 1 fi diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index 7eebcaf11a..0fd01fdb64 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb @@ -58,6 +58,8 @@ fakeroot archive_sdk() { DEST="./${SDK_ARCH}-${SDK_OS}" mv sysroots/${SDK_SYS} $DEST rm sysroots -rf + # There is a check in meta/files/toolchain-shar-extract.sh -- make sure to + # keep that check up to date if changing the `1024` patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative ${SDK_ARCHIVE_CMD} -- cgit v1.2.3-54-g00ecf