Skip to content

Commit 10af5a6

Browse files
tammelatgross35
authored andcommitted
ci: s390x: fix 'cannot find libc' error
Signed-off-by: Pedro Tammela <[email protected]> (backport <#4317>) (cherry picked from commit 4776e0f)
1 parent c6ad434 commit 10af5a6

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ci/linux-s390x.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ mkdir -m 777 /qemu
66
cd /qemu
77

88
curl --retry 5 -LO https://github.com/qemu/qemu/raw/HEAD/pc-bios/s390-ccw.img
9-
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20230607/images/generic/kernel.debian
10-
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20230607/images/generic/initrd.debian
9+
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20241227/images/generic/kernel.debian
10+
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20241227/images/generic/initrd.debian
1111

1212
mv kernel.debian kernel
1313
mv initrd.debian initrd.gz

ci/run.sh

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ test_flags="--skip check_style"
8787
case "$target" in
8888
# Only run `libc-test`
8989
# FIXME(android): unit tests fail to start on Android
90-
# FIXME(s390x): unit tests fail to locate glibc
9190
*android*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
9291
*s390x*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
9392
# For all other platforms, test everything in the workspace

src/unix/linux_like/linux/gnu/b64/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ s! {
7777
target_arch = "mips64r6",
7878
target_arch = "powerpc64",
7979
target_arch = "riscv64",
80-
target_arch = "sparc64"
80+
target_arch = "sparc64",
81+
target_arch = "s390x",
8182
)))]
8283
__reserved: crate::__syscall_ulong_t,
8384
pub sem_ctime: crate::time_t,
@@ -88,7 +89,8 @@ s! {
8889
target_arch = "mips64r6",
8990
target_arch = "powerpc64",
9091
target_arch = "riscv64",
91-
target_arch = "sparc64"
92+
target_arch = "sparc64",
93+
target_arch = "s390x",
9294
)))]
9395
__reserved2: crate::__syscall_ulong_t,
9496
pub sem_nsems: crate::__syscall_ulong_t,

0 commit comments

Comments
 (0)