From 66a12656b2f08013d243c4e7f002faef341f73aa Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Fri, 26 Jan 2024 13:31:34 +0400 Subject: [PATCH] feat: update extensions for Linux 6.6.x See https://github.com/siderolabs/pkgs/pull/873 Signed-off-by: Andrey Smirnov --- .kres.yaml | 6 ++-- Makefile | 6 ++-- drivers/thunderbolt/files/modules.txt | 2 +- drivers/usb-modem/files/modules-aarch64.txt | 36 +++++++++++++++++++ .../files/{modules.txt => modules-x86_64.txt} | 0 drivers/usb-modem/pkg.yaml | 2 +- drivers/v4l-uvc/files/modules.txt | 1 + 7 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 drivers/usb-modem/files/modules-aarch64.txt rename drivers/usb-modem/files/{modules.txt => modules-x86_64.txt} (100%) diff --git a/.kres.yaml b/.kres.yaml index 15293d05..edf58cc6 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -9,7 +9,7 @@ spec: - btrfs - chelsio-drivers - chelsio-firmware - - drbd + # - drbd see https://github.com/siderolabs/pkgs/pull/873 - ecr-credential-provider - fuse3 - gasket-driver @@ -33,7 +33,7 @@ spec: - util-linux-tools - v4l-uvc-drivers - xe-guest-utilities - - zfs + # - zfs see https://github.com/siderolabs/pkgs/pull/873 additionalTargets: nonfree: - nonfree-kmod-nvidia @@ -78,7 +78,7 @@ spec: - name: EXTENSIONS_IMAGE_REF defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS - defaultValue: v1.7.0-alpha.0-13-gf376a53 + defaultValue: v1.7.0-alpha.0-17-gefbbd23 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs depends: diff --git a/Makefile b/Makefile index bf709628..231521bf 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-01-22T17:59:56Z by kres latest. +# Generated on 2024-01-26T09:29:52Z by kres latest. # common variables @@ -57,7 +57,6 @@ TARGETS += bnx2-bnx2x TARGETS += btrfs TARGETS += chelsio-drivers TARGETS += chelsio-firmware -TARGETS += drbd TARGETS += ecr-credential-provider TARGETS += fuse3 TARGETS += gasket-driver @@ -81,13 +80,12 @@ TARGETS += usb-modem-drivers TARGETS += util-linux-tools TARGETS += v4l-uvc-drivers TARGETS += xe-guest-utilities -TARGETS += zfs NONFREE_TARGETS = nonfree-kmod-nvidia # extra variables EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) -PKGS ?= v1.7.0-alpha.0-13-gf376a53 +PKGS ?= v1.7.0-alpha.0-17-gefbbd23 PKGS_PREFIX ?= ghcr.io/siderolabs # help menu diff --git a/drivers/thunderbolt/files/modules.txt b/drivers/thunderbolt/files/modules.txt index 4ad4e5ac..e196496d 100644 --- a/drivers/thunderbolt/files/modules.txt +++ b/drivers/thunderbolt/files/modules.txt @@ -2,4 +2,4 @@ modules.order modules.builtin modules.builtin.modinfo kernel/drivers/thunderbolt/thunderbolt.ko -kernel/drivers/net/thunderbolt-net.ko +kernel/drivers/net/thunderbolt/thunderbolt_net.ko diff --git a/drivers/usb-modem/files/modules-aarch64.txt b/drivers/usb-modem/files/modules-aarch64.txt new file mode 100644 index 00000000..344735fb --- /dev/null +++ b/drivers/usb-modem/files/modules-aarch64.txt @@ -0,0 +1,36 @@ +modules.order +modules.builtin +modules.builtin.modinfo +kernel/drivers/net/usb/dm9601.ko +kernel/drivers/net/usb/rndis_host.ko +kernel/drivers/net/usb/smsc75xx.ko +kernel/drivers/net/usb/sierra_net.ko +kernel/drivers/net/usb/cdc_subset.ko +kernel/drivers/net/usb/int51x1.ko +kernel/drivers/net/usb/cdc_eem.ko +kernel/drivers/net/usb/cdc_ncm.ko +kernel/drivers/net/usb/zaurus.ko +kernel/drivers/net/usb/net1080.ko +kernel/drivers/net/usb/qmi_wwan.ko +kernel/drivers/net/usb/mcs7830.ko +kernel/drivers/net/usb/aqc111.ko +kernel/drivers/net/usb/sr9700.ko +kernel/drivers/net/usb/usbnet.ko +kernel/drivers/net/usb/sr9800.ko +kernel/drivers/net/usb/plusb.ko +kernel/drivers/net/usb/lg-vl600.ko +kernel/drivers/net/usb/cdc-phonet.ko +kernel/drivers/net/usb/smsc95xx.ko +kernel/drivers/net/usb/gl620a.ko +kernel/drivers/net/usb/r8153_ecm.ko +kernel/drivers/net/usb/cdc_ether.ko +kernel/drivers/net/usb/cx82310_eth.ko +kernel/drivers/net/usb/huawei_cdc_ncm.ko +kernel/drivers/net/usb/kalmia.ko +kernel/drivers/net/usb/asix.ko +kernel/drivers/net/usb/cdc_mbim.ko +kernel/drivers/net/usb/ax88179_178a.ko +kernel/drivers/net/phy/ax88796b.ko +kernel/drivers/usb/class/cdc-wdm.ko +kernel/drivers/usb/serial/usb_wwan.ko +kernel/drivers/usb/serial/option.ko diff --git a/drivers/usb-modem/files/modules.txt b/drivers/usb-modem/files/modules-x86_64.txt similarity index 100% rename from drivers/usb-modem/files/modules.txt rename to drivers/usb-modem/files/modules-x86_64.txt diff --git a/drivers/usb-modem/pkg.yaml b/drivers/usb-modem/pkg.yaml index 700342bc..7089ae31 100644 --- a/drivers/usb-modem/pkg.yaml +++ b/drivers/usb-modem/pkg.yaml @@ -16,7 +16,7 @@ steps: mkdir -p /rootfs - xargs -a /pkg/files/modules.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} + xargs -a /pkg/files/modules-{{ .ARCH }}.txt -I {} install -D /lib/modules/${KERNELRELEASE}/{} /rootfs/lib/modules/${KERNELRELEASE}/{} depmod -b /rootfs ${KERNELRELEASE} - test: - | diff --git a/drivers/v4l-uvc/files/modules.txt b/drivers/v4l-uvc/files/modules.txt index dbd2b458..49b0505e 100644 --- a/drivers/v4l-uvc/files/modules.txt +++ b/drivers/v4l-uvc/files/modules.txt @@ -1,6 +1,7 @@ modules.order modules.builtin modules.builtin.modinfo +kernel/drivers/media/common/uvc.ko kernel/drivers/media/common/videobuf2/videobuf2-common.ko kernel/drivers/media/common/videobuf2/videobuf2-memops.ko kernel/drivers/media/common/videobuf2/videobuf2-v4l2.ko