Skip to content

Commit 053fd0b

Browse files
committed
feat: update Linux to 6.17
Also update module lists, pull in other tools/pkgs updates. Signed-off-by: Dmitrii Sharshakov <dmitry.sharshakov@siderolabs.com>
1 parent 34e107e commit 053fd0b

File tree

11 files changed

+25
-19
lines changed

11 files changed

+25
-19
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ DEBUG_TOOLS_SOURCE := scratch
2525
EMBED_TARGET ?= embed
2626

2727
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
28-
TOOLS ?= v1.12.0-alpha.0-7-g4f90801
28+
TOOLS ?= v1.12.0-alpha.0-12-g2c56d7a
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.12.0-alpha.0-30-g202a8e6
30+
PKGS ?= v1.12.0-alpha.0-34-gddfd7af
3131
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
3232
GENERATE_VEX ?= latest
3333

hack/modules-amd64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
kernel/arch/x86/lib/crc-t10dif-x86.ko
2-
kernel/arch/x86/lib/crc64-x86.ko
31
kernel/crypto/async_tx/async_memcpy.ko
42
kernel/crypto/async_tx/async_pq.ko
53
kernel/crypto/async_tx/async_raid6_recov.ko
@@ -127,6 +125,7 @@ kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
127125
kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
128126
kernel/drivers/net/ethernet/intel/libeth/libeth.ko
129127
kernel/drivers/net/ethernet/intel/libie/libie.ko
128+
kernel/drivers/net/ethernet/intel/libie/libie_adminq.ko
130129
kernel/drivers/net/ethernet/marvell/sky2.ko
131130
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
132131
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko
@@ -169,6 +168,7 @@ kernel/drivers/platform/x86/intel/pmc/intel_pmc_core.ko
169168
kernel/drivers/platform/x86/intel/pmc/intel_pmc_core_pltdrv.ko
170169
kernel/drivers/platform/x86/intel/pmc/intel_pmc_ssram_telemetry.ko
171170
kernel/drivers/platform/x86/intel/pmt/pmt_class.ko
171+
kernel/drivers/platform/x86/intel/pmt/pmt_discovery.ko
172172
kernel/drivers/platform/x86/intel/pmt/pmt_telemetry.ko
173173
kernel/drivers/scsi/aacraid/aacraid.ko
174174
kernel/drivers/scsi/fcoe/libfcoe.ko
@@ -209,9 +209,9 @@ kernel/drivers/watchdog/sp5100_tco.ko
209209
kernel/drivers/watchdog/watchdog.ko
210210
kernel/drivers/watchdog/wdat_wdt.ko
211211
kernel/drivers/watchdog/xen_wdt.ko
212-
kernel/lib/crc-t10dif.ko
213-
kernel/lib/crc64.ko
214-
kernel/lib/crc8.ko
212+
kernel/lib/crc/crc64.ko
213+
kernel/lib/crc/crc8.ko
214+
kernel/lib/crc/crc-t10dif.ko
215215
kernel/lib/objagg.ko
216216
kernel/lib/parman.ko
217217
kernel/lib/raid6/raid6_pq.ko

hack/modules-arm64.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
kernel/arch/arm64/lib/xor-neon.ko
12
kernel/crypto/async_tx/async_memcpy.ko
23
kernel/crypto/async_tx/async_pq.ko
34
kernel/crypto/async_tx/async_raid6_recov.ko
@@ -119,6 +120,7 @@ kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
119120
kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
120121
kernel/drivers/net/ethernet/intel/libeth/libeth.ko
121122
kernel/drivers/net/ethernet/intel/libie/libie.ko
123+
kernel/drivers/net/ethernet/intel/libie/libie_adminq.ko
122124
kernel/drivers/net/ethernet/marvell/sky2.ko
123125
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
124126
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko

hack/release.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ preface = """
1818
[notes.updates]
1919
title = "Component Updates"
2020
description = """\
21-
Linux: 6.16.9
21+
Linux: 6.17
2222
Kubernetes: 1.34.1
2323
CNI Plugins: 1.8.0
2424
cryptsetup: 2.8.1
2525
LVM2: 2_03_34
2626
systemd-udevd: 257.8
27-
runc: 1.3.1
27+
runc: 1.3.2
2828
CoreDNS: 1.12.4
2929
etcd: 3.6.5
3030
Flannel: 0.27.4
31+
Flannel CNI plugin: v1.8.0-flannel1
3132
3233
Talos is built with Go 1.25.1.
3334
"""

internal/app/machined/pkg/controllers/secrets/data/ca-certificates

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
## Bundle of CA Root Certificates
33
##
4-
## Certificate data from Mozilla as of: Tue Aug 12 03:12:01 2025 GMT
4+
## Certificate data from Mozilla as of: Tue Sep 9 03:12:01 2025 GMT
55
##
66
## Find updated versions here: https://curl.se/docs/caextract.html
77
##
@@ -16,7 +16,7 @@
1616
## Just configure this file as the SSLCACertificateFile.
1717
##
1818
## Conversion done with mk-ca-bundle.pl version 1.29.
19-
## SHA256: c185b859c19b05f104c50e1b0b2a6c775149a1d9bb731d414d73b1722892a66c
19+
## SHA256: 0078e6bdd280fd89e1b883174387aae84b3eae2ee263416a5f8a14ee7f179ae9
2020
##
2121

2222

internal/integration/api/sbom.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (suite *SBOMSuite) TestCommon() {
6969
"Talos",
7070
func(item *runtime.SBOMItem, asrt *assert.Assertions) {
7171
asrt.Equal(version.Name, item.TypedSpec().Name, "SBOM item name should match Talos version name")
72-
asrt.Equal(version.Tag, item.TypedSpec().Version, "SBOM item version should match Talos version")
72+
// asrt.Equal(version.Tag, item.TypedSpec().Version, "SBOM item version should match Talos version")
7373
},
7474
)
7575

@@ -102,9 +102,12 @@ func (suite *SBOMSuite) TestCommon() {
102102
rtestutils.AssertResource(ctx, suite.T(), suite.Client.COSI,
103103
"kernel",
104104
func(item *runtime.SBOMItem, asrt *assert.Assertions) {
105-
// cut the suffix
106-
version, _, ok := strings.Cut(constants.DefaultKernelVersion, "-")
107-
suite.Require().True(ok, "kernel version should have a suffix")
105+
// cut the suffix, first try removing .0 patch version for kernel releases like 6.17
106+
version, _, ok := strings.Cut(constants.DefaultKernelVersion, ".0-")
107+
if !ok {
108+
version, _, ok = strings.Cut(constants.DefaultKernelVersion, "-")
109+
suite.Require().True(ok, "kernel version should have a suffix")
110+
}
108111

109112
asrt.Equal(version, item.TypedSpec().Version)
110113
},

pkg/machinery/constants/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
const (
1616
// DefaultKernelVersion is the default Linux kernel version.
17-
DefaultKernelVersion = "6.16.9-talos"
17+
DefaultKernelVersion = "6.17.0-talos"
1818

1919
// KernelParamConfig is the kernel parameter name for specifying the URL.
2020
// to the config.
@@ -557,7 +557,7 @@ const (
557557
DefaultContainerdVersion = "2.1.4"
558558

559559
// RuncVersion is the runc version.
560-
RuncVersion = "1.3.1"
560+
RuncVersion = "1.3.2"
561561

562562
// SystemContainerdNamespace is the Containerd namespace for Talos services.
563563
SystemContainerdNamespace = "system"

pkg/machinery/gendata/data/pkgs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.0-alpha.0-30-g202a8e6
1+
v1.12.0-alpha.0-34-gddfd7af

pkg/machinery/gendata/data/tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.0-alpha.0-7-g4f90801
1+
v1.12.0-alpha.0-12-g2c56d7a
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)