Skip to content

Commit 3566693

Browse files
committed
ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6->7.0)
1 parent 1d9ef30 commit 3566693

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

ci/install-musl.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -eux
88
arch="$1"
99
version="$2"
1010
old_musl=1.1.24
11-
new_musl=1.2.5
11+
new_musl=1.2.6
1212

1313
case "$arch" in
1414
loongarch64) musl_version="$new_musl" ;;
@@ -108,18 +108,20 @@ rm -rf "$musl"
108108

109109
# Download, configure, build, and install musl-sanitized kernel headers.
110110

111-
# Alpine follows stable kernel releases, 3.20 uses Linux 6.6 headers.
112-
alpine_version=3.20
111+
# Alpine follows stable kernel releases, 3.24 uses Linux 7.0 headers.
112+
alpine_version=3.24
113113
alpine_git=https://git.alpinelinux.org/aports
114114

115-
# This routine piggybacks on: https://git.alpinelinux.org/aports/tree/main/linux-headers?h=3.20-stable
115+
# This routine piggybacks on: https://git.alpinelinux.org/aports/tree/main/linux-headers?h=3.24-stable
116116
git clone -n --depth=1 --filter=tree:0 -b "${alpine_version}-stable" "$alpine_git"
117117
(
118118
cd aports
119119
git sparse-checkout set --no-cone main/linux-headers
120120
git checkout
121-
122121
cd main/linux-headers
122+
123+
# Create a version of APKBUILD that dumps the variables we're interested
124+
# in. This file doesn't retrieve or build anything on its own.
123125
cp APKBUILD APKBUILD.vars
124126
cat <<- EOF >> APKBUILD.vars
125127
echo "\$source" > alpine-source

libc-test/build.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4274,6 +4274,7 @@ fn test_linux(target: &str) {
42744274

42754275
// Recent additions
42764276
"ptp_sys_offset_extended" if kernel < (6, 12) => true,
4277+
"epoll_params" if old_musl => true,
42774278
"epoll_params" => kernel < (6, 9),
42784279
"mnt_ns_info" => kernel < (6, 12),
42794280

@@ -4789,6 +4790,7 @@ fn test_linux(target: &str) {
47894790
| "PF_RANDOMIZE" | "PF_NO_SETAFFINITY" | "PF_MCE_EARLY" | "PF_MEMALLOC_PIN"
47904791
| "PF_BLOCK_TS" | "PF_SUSPEND_TASK" => true,
47914792

4793+
"EPIOCSPARAMS" | "EPIOCGPARAMS" if old_musl => true,
47924794
"EPIOCSPARAMS" | "EPIOCGPARAMS" => kernel < (6, 9),
47934795
"MAP_DROPPABLE" => kernel < (6, 11),
47944796
"SOF_TIMESTAMPING_OPT_RX_FILTER" => kernel < (6, 12),
@@ -4806,6 +4808,7 @@ fn test_linux(target: &str) {
48064808
"SECURE_ALL_BITS" | "SECURE_ALL_LOCKS" => kernel < (6, 14),
48074809

48084810
// Recent additions
4811+
"AT_HWCAP3" | "AT_HWCAP4" if old_musl => true,
48094812
"AT_HWCAP3" | "AT_HWCAP4" => kernel < (6, 9),
48104813
"PTRACE_SET_SYSCALL_INFO" => kernel < (6, 16),
48114814

0 commit comments

Comments
 (0)