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 <noreply@anthropic.com>
This commit is contained in:
Mathias Beaulieu-Duncan 2026-02-14 10:50:45 -05:00
parent dc37b435c3
commit 37f9292ef1
2 changed files with 5 additions and 3 deletions

View File

@ -11,7 +11,7 @@ diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt
index 3b11b7551..95c3ee669 100644 index 3b11b7551..95c3ee669 100644
--- a/hack/modules-arm64.txt --- a/hack/modules-arm64.txt
+++ b/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt
@@ -1,237 +1,190 @@ @@ -1,238 +1,191 @@
-kernel/arch/arm64/lib/xor-neon.ko -kernel/arch/arm64/lib/xor-neon.ko
+modules.builtin.bin +modules.builtin.bin
+modules.builtin.modinfo +modules.builtin.modinfo
@ -47,6 +47,7 @@ index 3b11b7551..95c3ee669 100644
+kernel/crypto/xxhash_generic.ko +kernel/crypto/xxhash_generic.ko
+kernel/crypto/zstd.ko +kernel/crypto/zstd.ko
+kernel/net/ipv4/ip_gre.ko +kernel/net/ipv4/ip_gre.ko
+kernel/net/ipv6/ip6_gre.ko
+kernel/net/tls/tls.ko +kernel/net/tls/tls.ko
+kernel/net/openvswitch/vport-gre.ko +kernel/net/openvswitch/vport-gre.ko
+kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko +kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko
@ -394,6 +395,7 @@ index 3b11b7551..95c3ee669 100644
kernel/lib/parman.ko kernel/lib/parman.ko
-kernel/lib/raid6/raid6_pq.ko -kernel/lib/raid6/raid6_pq.ko
-kernel/net/ipv4/ip_gre.ko -kernel/net/ipv4/ip_gre.ko
-kernel/net/ipv6/ip6_gre.ko
-kernel/net/openvswitch/vport-gre.ko -kernel/net/openvswitch/vport-gre.ko
-kernel/net/tls/tls.ko -kernel/net/tls/tls.ko
+kernel/fs/btrfs/btrfs.ko +kernel/fs/btrfs/btrfs.ko

View File

@ -83,11 +83,11 @@ fi
echo "Running patch smoke test ..." >&2 echo "Running patch smoke test ..." >&2
if ! gmake checkouts patches; then if ! gmake checkouts patches; then
echo "Patches failed to apply!" >&2 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" echo "patch_failed=true"
exit 0 exit 0
fi fi
gmake checkouts-clean gmake checkouts-clean >/dev/null 2>&1
# ── Generate tag ──────────────────────────────────────────────────── # ── Generate tag ────────────────────────────────────────────────────
TALOS_VER=$(grep '^TALOS_VERSION' "$MAKEFILE" | awk '{print $NF}') TALOS_VER=$(grep '^TALOS_VERSION' "$MAKEFILE" | awk '{print $NF}')