ci: Bump musl 1.2.5->1.2.6 and Alpine headers 3.20->3.24 (kernel 6.6->7.0)

Author: tgross35

ci/install-musl.sh

@@ -8,7 +8,7 @@ set -eux
 arch="$1"
 version="$2"
 old_musl=1.1.24
-new_musl=1.2.5
+new_musl=1.2.6
 
 case "$arch" in
     loongarch64) musl_version="$new_musl" ;;
@@ -108,18 +108,20 @@ rm -rf "$musl"
 
 # Download, configure, build, and install musl-sanitized kernel headers.
 
-# Alpine follows stable kernel releases, 3.20 uses Linux 6.6 headers.
-alpine_version=3.20
+# Alpine follows stable kernel releases, 3.24 uses Linux 7.0 headers.
+alpine_version=3.24
 alpine_git=https://git.alpinelinux.org/aports
 
-# This routine piggybacks on: https://git.alpinelinux.org/aports/tree/main/linux-headers?h=3.20-stable
+# This routine piggybacks on: https://git.alpinelinux.org/aports/tree/main/linux-headers?h=3.24-stable
 git clone -n --depth=1 --filter=tree:0 -b "${alpine_version}-stable" "$alpine_git"
 (
     cd aports
     git sparse-checkout set --no-cone main/linux-headers
     git checkout
-
     cd main/linux-headers
+
+    # Create a version of APKBUILD that dumps the variables we're interested
+    # in. This file doesn't retrieve or build anything on its own.
     cp APKBUILD APKBUILD.vars
     cat <<- EOF >> APKBUILD.vars
         echo "\$source" > alpine-source
@@ -129,8 +131,9 @@ git clone -n --depth=1 --filter=tree:0 -b "${alpine_version}-stable" "$alpine_gi
 EOF
 
     # Use a mirror since kernel.org can be a bit inconsistent
-    sed -i 's|https://kernel.org/pub/linux/kernel|https://ci-mirrors.rust-lang.org/linux/kernel|g' \
-        APKBUILD.vars
+    # FIXME(ci): re-enable once the mirror URL is fixed
+    # sed -i 's|https://kernel.org/pub/linux/kernel|https://ci-mirrors.rust-lang.org/linux/kernel|g' \
+    #     APKBUILD.vars
 
     cat APKBUILD.vars
 

libc-test/build.rs

@@ -4257,6 +4257,7 @@ fn test_linux(target: &str) {
 
             // Recent additions
             "ptp_sys_offset_extended" if kernel < (6, 12) => true,
+            "epoll_params" if old_musl => true,
             "epoll_params" => kernel < (6, 9),
             "mnt_ns_info" => kernel < (6, 12),
 
@@ -4772,6 +4773,7 @@ fn test_linux(target: &str) {
             | "PF_RANDOMIZE" | "PF_NO_SETAFFINITY" | "PF_MCE_EARLY" | "PF_MEMALLOC_PIN"
             | "PF_BLOCK_TS" | "PF_SUSPEND_TASK" => true,
 
+            "EPIOCSPARAMS" | "EPIOCGPARAMS" if old_musl => true,
             "EPIOCSPARAMS" | "EPIOCGPARAMS" => kernel < (6, 9),
             "MAP_DROPPABLE" => kernel < (6, 11),
             "SOF_TIMESTAMPING_OPT_RX_FILTER" => kernel < (6, 12),
@@ -4789,6 +4791,7 @@ fn test_linux(target: &str) {
             "SECURE_ALL_BITS" | "SECURE_ALL_LOCKS" => kernel < (6, 14),
 
             // Recent additions
+            "AT_HWCAP3" | "AT_HWCAP4" if old_musl => true,
             "AT_HWCAP3" | "AT_HWCAP4" => kernel < (6, 9),
             "PTRACE_SET_SYSCALL_INFO" => kernel < (6, 16),