Skip to content

Commit 4cdbaad

Browse files
authored
Fix tizen rootfs setup for arm64 and riscv64 (#15746)
1 parent 76dd1b4 commit 4cdbaad

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

eng/common/cross/arm64/tizen/tizen.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
55
Use the shared library, but some functions are only in
66
the static library, so try that secondarily. */
77
OUTPUT_FORMAT(elf64-littleaarch64)
8-
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
99
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

eng/common/cross/tizen-fetch.sh

+2-7
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,8 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159-
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160-
BASE="Tizen-Base-RISCV"
161-
UNIFIED="Tizen-Unified-RISCV"
162-
else
163-
BASE="Tizen-Base"
164-
UNIFIED="Tizen-Unified"
165-
fi
159+
BASE="Tizen-Base"
160+
UNIFIED="Tizen-Unified"
166161

167162
Inform "Initialize ${TIZEN_ARCH} base"
168163
fetch_tizen_pkgs_init standard $BASE

0 commit comments

Comments
 (0)