test

nberlee · Dec 13, 2023 · 6a7d7f6 · 6a7d7f6
1 parent cd0f56e
commit 6a7d7f6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 95 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-3-gcb3e668-dirty AS pkg-u-boot-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/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,8 +17,8 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
 ARTIFACTS := _out
 TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-1-g336d248
 PKGS ?= v1.6.0-3-g617d342
+PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-10-g67f5ebf
 EXTRAS ?= v1.6.0-1-g113887a
-PKG_KERNEL ?= ghcr.io/nberlee/kernel:v1.6.0-3-gcb3e668
 # renovate: datasource=github-tags depName=golang/go
 GO_VERSION ?= 1.21
 # renovate: datasource=go depName=golang.org/x/tools

diff --git a/hack/modules-amd64.txt b/hack/modules-amd64.txt
@@ -6,10 +6,7 @@ kernel/crypto/async_tx/async_pq.ko
 kernel/crypto/async_tx/async_raid6_recov.ko
 kernel/crypto/async_tx/async_tx.ko
 kernel/crypto/async_tx/async_xor.ko
-kernel/crypto/blake2b_generic.ko
 kernel/crypto/xor.ko
-kernel/crypto/xxhash_generic.ko
-kernel/crypto/zstd.ko
 kernel/drivers/hwmon/fam15h_power.ko
 kernel/drivers/hwmon/i5500_temp.ko
 kernel/drivers/hwmon/i5k_amb.ko
@@ -28,11 +25,6 @@ kernel/drivers/net/ethernet/atheros/alx/alx.ko
 kernel/drivers/net/ethernet/broadcom/bnx2.ko
 kernel/drivers/net/ethernet/broadcom/bnx2x/bnx2x.ko
 kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_en.ko
-kernel/drivers/net/ethernet/chelsio/cxgb/cxgb.ko
-kernel/drivers/net/ethernet/chelsio/cxgb3/cxgb3.ko
-kernel/drivers/net/ethernet/chelsio/cxgb4/cxgb4.ko
-kernel/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf.ko
-kernel/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/ch_ipsec.ko
 kernel/drivers/net/ethernet/cisco/enic/enic.ko
 kernel/drivers/net/ethernet/emulex/benet/be2net.ko
 kernel/drivers/net/ethernet/google/gve/gve.ko
@@ -66,36 +58,6 @@ kernel/drivers/net/ethernet/sfc/siena/sfc-siena.ko
 kernel/drivers/net/mdio.ko
 kernel/drivers/net/phy/ax88796b.ko
 kernel/drivers/net/phy/smsc.ko
-kernel/drivers/net/thunderbolt/thunderbolt_net.ko
-kernel/drivers/net/usb/aqc111.ko
-kernel/drivers/net/usb/asix.ko
-kernel/drivers/net/usb/ax88179_178a.ko
-kernel/drivers/net/usb/cdc-phonet.ko
-kernel/drivers/net/usb/cdc_eem.ko
-kernel/drivers/net/usb/cdc_ether.ko
-kernel/drivers/net/usb/cdc_mbim.ko
-kernel/drivers/net/usb/cdc_ncm.ko
-kernel/drivers/net/usb/cdc_subset.ko
-kernel/drivers/net/usb/cx82310_eth.ko
-kernel/drivers/net/usb/dm9601.ko
-kernel/drivers/net/usb/gl620a.ko
-kernel/drivers/net/usb/huawei_cdc_ncm.ko
-kernel/drivers/net/usb/int51x1.ko
-kernel/drivers/net/usb/kalmia.ko
-kernel/drivers/net/usb/lg-vl600.ko
-kernel/drivers/net/usb/mcs7830.ko
-kernel/drivers/net/usb/net1080.ko
-kernel/drivers/net/usb/plusb.ko
-kernel/drivers/net/usb/qmi_wwan.ko
-kernel/drivers/net/usb/r8153_ecm.ko
-kernel/drivers/net/usb/rndis_host.ko
-kernel/drivers/net/usb/sierra_net.ko
-kernel/drivers/net/usb/smsc75xx.ko
-kernel/drivers/net/usb/smsc95xx.ko
-kernel/drivers/net/usb/sr9700.ko
-kernel/drivers/net/usb/sr9800.ko
-kernel/drivers/net/usb/usbnet.ko
-kernel/drivers/net/usb/zaurus.ko
 kernel/drivers/net/vmxnet3/vmxnet3.ko
 kernel/drivers/scsi/aacraid/aacraid.ko
 kernel/drivers/scsi/hpsa.ko
@@ -104,20 +66,14 @@ 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/usb/class/cdc-wdm.ko
-kernel/drivers/usb/serial/option.ko
-kernel/drivers/usb/serial/usb_wwan.ko
 kernel/drivers/virtio/virtio_balloon.ko
 kernel/drivers/virtio/virtio_input.ko
 kernel/drivers/virtio/virtio_mmio.ko
 kernel/drivers/virtio/virtio_pci.ko
 kernel/drivers/virtio/virtio_pci_legacy_dev.ko
 kernel/drivers/virtio/virtio_pci_modern_dev.ko
-kernel/fs/binfmt_misc.ko
-kernel/fs/btrfs/btrfs.ko
 kernel/lib/objagg.ko
 kernel/lib/parman.ko
 kernel/lib/raid6/raid6_pq.ko
-kernel/lib/zstd/zstd_compress.ko
 kernel/net/ipv4/ip_gre.ko
 kernel/net/openvswitch/vport-gre.ko
diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt
@@ -7,10 +7,7 @@ kernel/crypto/async_tx/async_pq.ko
 kernel/crypto/async_tx/async_raid6_recov.ko
 kernel/crypto/async_tx/async_tx.ko
 kernel/crypto/async_tx/async_xor.ko
-kernel/crypto/blake2b_generic.ko
 kernel/crypto/xor.ko
-kernel/crypto/xxhash_generic.ko
-kernel/crypto/zstd.ko
 kernel/drivers/dma/bcm-sba-raid.ko
 kernel/drivers/hwmon/i5k_amb.ko
 kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko
@@ -24,11 +21,6 @@ kernel/drivers/md/dm-thin-pool.ko
 kernel/drivers/md/persistent-data/dm-persistent-data.ko
 kernel/drivers/md/raid456.ko
 kernel/drivers/net/ethernet/atheros/alx/alx.ko
-kernel/drivers/net/ethernet/chelsio/cxgb/cxgb.ko
-kernel/drivers/net/ethernet/chelsio/cxgb3/cxgb3.ko
-kernel/drivers/net/ethernet/chelsio/cxgb4/cxgb4.ko
-kernel/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf.ko
-kernel/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/ch_ipsec.ko
 kernel/drivers/net/ethernet/google/gve/gve.ko
 kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
 kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko
@@ -42,46 +34,8 @@ kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko
 kernel/drivers/net/ethernet/sfc/siena/sfc-siena.ko
 kernel/drivers/net/mdio/mdio-mux-meson-gxl.ko
 kernel/drivers/net/phy/ax88796b.ko
-kernel/drivers/net/thunderbolt/thunderbolt_net.ko
-kernel/drivers/net/usb/aqc111.ko
-kernel/drivers/net/usb/asix.ko
-kernel/drivers/net/usb/ax88179_178a.ko
-kernel/drivers/net/usb/cdc-phonet.ko
-kernel/drivers/net/usb/cdc_eem.ko
-kernel/drivers/net/usb/cdc_ether.ko
-kernel/drivers/net/usb/cdc_mbim.ko
-kernel/drivers/net/usb/cdc_ncm.ko
-kernel/drivers/net/usb/cdc_subset.ko
-kernel/drivers/net/usb/ch9200.ko
-kernel/drivers/net/usb/cx82310_eth.ko
-kernel/drivers/net/usb/dm9601.ko
-kernel/drivers/net/usb/gl620a.ko
-kernel/drivers/net/usb/huawei_cdc_ncm.ko
-kernel/drivers/net/usb/int51x1.ko
-kernel/drivers/net/usb/kalmia.ko
-kernel/drivers/net/usb/lg-vl600.ko
-kernel/drivers/net/usb/mcs7830.ko
-kernel/drivers/net/usb/net1080.ko
-kernel/drivers/net/usb/plusb.ko
-kernel/drivers/net/usb/qmi_wwan.ko
-kernel/drivers/net/usb/r8153_ecm.ko
-kernel/drivers/net/usb/rndis_host.ko
-kernel/drivers/net/usb/sierra_net.ko
-kernel/drivers/net/usb/smsc75xx.ko
-kernel/drivers/net/usb/smsc95xx.ko
-kernel/drivers/net/usb/sr9700.ko
-kernel/drivers/net/usb/sr9800.ko
-kernel/drivers/net/usb/usbnet.ko
-kernel/drivers/net/usb/zaurus.ko
-kernel/drivers/thunderbolt/thunderbolt.ko
-kernel/drivers/usb/class/cdc-wdm.ko
-kernel/drivers/usb/serial/option.ko
-kernel/drivers/usb/serial/usb_wwan.ko
-kernel/fs/binfmt_misc.ko
-kernel/fs/btrfs/btrfs.ko
 kernel/lib/objagg.ko
 kernel/lib/parman.ko
 kernel/lib/raid6/raid6_pq.ko
-kernel/lib/zstd/zstd_compress.ko
 kernel/net/ipv4/ip_gre.ko
 kernel/net/openvswitch/vport-gre.ko
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go b/internal/app/machined/pkg/runtime/v1alpha1/board/turing_rk1/turing_rk1.go
@@ -23,7 +23,7 @@ var (
 	dtb       = "rockchip/rk3588-turing-rk1.dtb"
 )
 
-// TuringRK1 represents the Turing RK1 board.
+// TuringRK1 represents the Rockchip RK3588 based SoM from Turing Machines.
 //
 // Reference: https://rockpi.org/
 type TuringRK1 struct{}
@@ -81,7 +81,7 @@ func (r *TuringRK1) Install(options runtime.BoardInstallOptions) (err error) {
 // KernelArgs implements the runtime.Board.
 func (r *TuringRK1) KernelArgs() procfs.Parameters {
 	return []*procfs.Parameter{
-		procfs.NewParameter("console").Append("tty0").Append("ttyS0,115200").Append("ttyS2,115200"),
+		procfs.NewParameter("console").Append("tty0").Append("ttyS9,115200").Append("ttyS2,115200"),
 		procfs.NewParameter("sysctl.kernel.kexec_load_disabled").Append("1"),
 		procfs.NewParameter(constants.KernelParamDashboardDisabled).Append("1"),
 		procfs.NewParameter("irqchip.gicv3_pseudo_nmi").Append("0"),

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.5-talos"
+	DefaultKernelVersion = "6.6.6-talos"
 
 	// KernelModulesPath is the default path to the kernel modules without the kernel version.
 	KernelModulesPath = "/lib/modules"