test: Not the right way, modules will be installed in an extension, b…

…ut for testing I now put them here
nberlee · Dec 16, 2023 · fd160bf · fd160bf
1 parent 458463f
commit fd160bf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -82,7 +82,7 @@ FROM ${PKG_KERNEL} AS pkg-kernel
 FROM --platform=amd64 ${PKG_KERNEL} AS pkg-kernel-amd64
 FROM --platform=arm64 ${PKG_KERNEL} AS pkg-kernel-arm64
 
-FROM --platform=arm64 ghcr.io/nberlee/u-boot:v1.6.0-9-ga77df45-dirty AS pkg-u-boot-arm64
+FROM --platform=arm64 ghcr.io/nberlee/u-boot:v1.6.0-8-g85e2fdb-dirty AS pkg-u-boot-arm64
 FROM --platform=arm64 ghcr.io/siderolabs/raspberrypi-firmware:${PKGS} AS pkg-raspberrypi-firmware-arm64
 
 # Resolve package images using ${EXTRAS} to be used later in COPY --from=.

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
 ARTIFACTS := _out
 TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-1-g336d248
 PKGS ?= v1.6.0-5-g3ae2450
-PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-8-g413418f
+PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-8-g85e2fdb
 EXTRAS ?= v1.6.0-1-g113887a
 # renovate: datasource=github-tags depName=golang/go
 GO_VERSION ?= 1.21

diff --git a/hack/modules-amd64.txt b/hack/modules-amd64.txt
@@ -65,7 +65,6 @@ kernel/drivers/scsi/megaraid/megaraid_sas.ko
 kernel/drivers/scsi/mpt3sas/mpt3sas.ko
 kernel/drivers/scsi/smartpqi/smartpqi.ko
 kernel/drivers/scsi/vmw_pvscsi.ko
-kernel/drivers/thunderbolt/thunderbolt.ko
 kernel/drivers/virtio/virtio_balloon.ko
 kernel/drivers/virtio/virtio_input.ko
 kernel/drivers/virtio/virtio_mmio.ko

diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt
@@ -39,3 +39,12 @@ kernel/lib/parman.ko
 kernel/lib/raid6/raid6_pq.ko
 kernel/net/ipv4/ip_gre.ko
 kernel/net/openvswitch/vport-gre.ko
+kernel/drivers/cpufreq/rockchip-cpufreq.ko
+kernel/drivers/crypto/rockchip/rk_crypto2.ko
+kernel/drivers/phy/rockchip/phy-rockchip-naneng-combphy.ko
+kernel/drivers/phy/rockchip/phy-rockchip-snps-pcie3.ko
+kernel/drivers/regulator/rk808-regulator.ko
+kernel/drivers/mfd/rk8xx-core.ko
+kernel/drivers/mfd/rk8xx-spi.ko
+kernel/crypto/sm3_generic.ko
+kernel/drivers/char/hw_random/rockchip-rng.ko
diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go
@@ -16,7 +16,7 @@ import (
 
 const (
 	// DefaultKernelVersion is the default Linux kernel version.
-	DefaultKernelVersion = "6.6.6-talos"
+	DefaultKernelVersion = "6.6.7-talos"
 
 	// KernelModulesPath is the default path to the kernel modules without the kernel version.
 	KernelModulesPath = "/lib/modules"