From 37f9292ef1d1fbb8d92fffbb74dcb0e7fa1b93c6 Mon Sep 17 00:00:00 2001 From: Mathias Beaulieu-Duncan Date: Sat, 14 Feb 2026 10:50:45 -0500 Subject: [PATCH] Update arm64 modules patch for Talos v1.12.4 (add ip6_gre) Talos v1.12.4 added kernel/net/ipv6/ip6_gre.ko to modules-arm64.txt. Update our patch to match. Also silence gmake checkouts-clean stdout in auto-update.sh to prevent it leaking into GITHUB_OUTPUT. Co-Authored-By: Claude Opus 4.6 --- .../siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch | 4 +++- scripts/auto-update.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/patches/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch b/patches/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch index eb7f3c0..45445ae 100644 --- a/patches/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch +++ b/patches/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch @@ -11,7 +11,7 @@ diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt index 3b11b7551..95c3ee669 100644 --- a/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt -@@ -1,237 +1,190 @@ +@@ -1,238 +1,191 @@ -kernel/arch/arm64/lib/xor-neon.ko +modules.builtin.bin +modules.builtin.modinfo @@ -47,6 +47,7 @@ index 3b11b7551..95c3ee669 100644 +kernel/crypto/xxhash_generic.ko +kernel/crypto/zstd.ko +kernel/net/ipv4/ip_gre.ko ++kernel/net/ipv6/ip6_gre.ko +kernel/net/tls/tls.ko +kernel/net/openvswitch/vport-gre.ko +kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko @@ -394,6 +395,7 @@ index 3b11b7551..95c3ee669 100644 kernel/lib/parman.ko -kernel/lib/raid6/raid6_pq.ko -kernel/net/ipv4/ip_gre.ko +-kernel/net/ipv6/ip6_gre.ko -kernel/net/openvswitch/vport-gre.ko -kernel/net/tls/tls.ko +kernel/fs/btrfs/btrfs.ko diff --git a/scripts/auto-update.sh b/scripts/auto-update.sh index d4e77cc..7f09b04 100755 --- a/scripts/auto-update.sh +++ b/scripts/auto-update.sh @@ -83,11 +83,11 @@ fi echo "Running patch smoke test ..." >&2 if ! gmake checkouts patches; then echo "Patches failed to apply!" >&2 - gmake checkouts-clean 2>/dev/null || true + gmake checkouts-clean >/dev/null 2>&1 || true echo "patch_failed=true" exit 0 fi -gmake checkouts-clean +gmake checkouts-clean >/dev/null 2>&1 # ── Generate tag ──────────────────────────────────────────────────── TALOS_VER=$(grep '^TALOS_VERSION' "$MAKEFILE" | awk '{print $NF}')