Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions ci/docker/i686-unknown-linux-gnu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
FROM ubuntu:23.10
FROM ubuntu:25.04

# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
/etc/apt/sources.list && \
apt-get update && apt-get install -y --no-install-recommends \
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
gcc-multilib \
libc6-dev
Expand Down
27 changes: 5 additions & 22 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4039,7 +4039,7 @@ fn test_linux(target: &str) {
cfg.skip_struct(move |struct_| {
let ty = struct_.ident();

// FIXME(linux): CI has old headers
// FIXME(linux): Requires >= 6.12 kernel headers. CI has old headers
if ty == "ptp_sys_offset_extended" {
return true;
}
Expand Down Expand Up @@ -4106,14 +4106,10 @@ fn test_linux(target: &str) {
"sctp_initmsg" | "sctp_sndrcvinfo" | "sctp_sndinfo" | "sctp_rcvinfo"
| "sctp_nxtinfo" | "sctp_prinfo" | "sctp_authinfo" => true,

// FIXME(linux): Requires >= 6.8 kernel headers.
// A field was added in 6.8.
// https://github.com/torvalds/linux/commit/341ac980eab90ac1f6c22ee9f9da83ed9604d899
// The previous version of the struct was removed in 6.11 due to a bug.
// https://github.com/torvalds/linux/commit/32654bbd6313b4cfc82297e6634fa9725c3c900f
"xdp_umem_reg" => true,

// FIXME(linux): Requires >= 6.8 kernel headers.
// FIXME(linux): A new field was added to `xsk_tx_metadata_request` in linux 6.15.
// https://github.com/torvalds/linux/commit/ca4419f15abd19ba8be1e109661b60f9f5b6c9f0
// When updating, consider giving the `__c_anonymous_` prefix to the enum variants
// `xsk_tx_metadata_request` and `xsk_tx_metadata_completion`.
"xsk_tx_metadata" | "xsk_tx_metadata_request" | "xsk_tx_metadata_completion" => true,

// A new field was added in kernel 5.4, this is the old version for backwards compatibility.
Expand Down Expand Up @@ -4422,18 +4418,8 @@ fn test_linux(target: &str) {
true
}

// FIXME(linux): Requires >= 6.6 kernel headers.
"XDP_USE_SG" | "XDP_PKT_CONTD" => true,

// FIXME(linux): Missing only on this platform for some reason
"PR_MDWE_NO_INHERIT" if gnueabihf => true,

// FIXME(linux): Requires >= 6.8 kernel headers.
"XDP_UMEM_TX_SW_CSUM"
| "XDP_TXMD_FLAGS_TIMESTAMP"
| "XDP_TXMD_FLAGS_CHECKSUM"
| "XDP_TX_METADATA" => true,

// FIXME(linux): Requires >= 6.11 kernel headers.
"XDP_UMEM_TX_METADATA_LEN" => true,

Expand All @@ -4448,9 +4434,6 @@ fn test_linux(target: &str) {
true
}

// FIXME(linux): Requires >= 6.6 kernel headers.
"SYS_fchmodat2" => true,

// FIXME(linux): Requires >= 6.10 kernel headers.
"SYS_mseal" => true,

Expand Down
Loading