Skip to content

Commit

Permalink
feat: update extensions for Linux 6.6.x
Browse files Browse the repository at this point in the history
See siderolabs/pkgs#873

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira authored and pl4nty committed Feb 23, 2024
1 parent ed6d063 commit 4405546
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -33,7 +33,7 @@ spec:
- usb-modem-drivers
- util-linux-tools
- xe-guest-utilities
- zfs
# - zfs see https://github.com/siderolabs/pkgs/pull/873
additionalTargets:
nonfree:
- nonfree-kmod-nvidia
Expand Down Expand Up @@ -74,7 +74,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:
Expand Down
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -81,13 +80,12 @@ TARGETS += thunderbolt
TARGETS += usb-modem-drivers
TARGETS += util-linux-tools
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
Expand Down
2 changes: 1 addition & 1 deletion drivers/thunderbolt/files/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
36 changes: 36 additions & 0 deletions drivers/usb-modem/files/modules-aarch64.txt
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/usb-modem/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- |
Expand Down
12 changes: 12 additions & 0 deletions drivers/v4l-uvc/files/modules.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
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
kernel/drivers/media/common/videobuf2/videobuf2-vmalloc.ko
kernel/drivers/media/mc/mc.ko
kernel/drivers/media/usb/uvc/uvcvideo.ko
kernel/drivers/media/v4l2-core/v4l2-dv-timings.ko
kernel/drivers/media/v4l2-core/videodev.ko

0 comments on commit 4405546

Please sign in to comment.