lukaszraczylo/talos-builder
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/talos-builder.git synced 2026-06-28 04:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates to build against newest releases; kernel is crashing

Browse Source
This commit is contained in:
local-build
2026-04-04 20:58:20 -05:00
parent 9706cd4215
commit 57cb3d5e09
5 changed files with 278 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+36 -72
View File
@@ -1,6 +1,6 @@
PKG_VERSION = v1.12.0 PKG_VERSION = v1.12.0
TALOS_VERSION = v1.12.1 TALOS_VERSION = v1.12.6
SBCOVERLAY_VERSION = main SBCOVERLAY_VERSION = v0.2.0
PUSH ?= true PUSH ?= true
REGISTRY ?= ghcr.io REGISTRY ?= ghcr.io
@@ -12,24 +12,22 @@ REGISTRY_USERNAME ?= talos-$(RPI_MODEL)
TAG ?= $(shell git describe --tags --exact-match) TAG ?= $(shell git describe --tags --exact-match)
SED ?= sed SED ?= sed
ASSET_TYPE ?= installer ASSET_TYPE ?= rpi_5
CONFIG_TXT = dtparam=i2c_arm=on CONFIG_TXT ?= dtparam=i2c_arm=on
EXTENSIONS ?= EXTENSIONS ?=
EXTENSION_ARGS = $(foreach ext,$(EXTENSIONS),--system-extension-image $(ext)) EXTENSION_ARGS = $(foreach ext,$(EXTENSIONS),--system-extension-image $(ext))
SBCOVERLAY_PI4_IMAGE ?= ghcr.io/siderolabs/sbc-raspberrypi:v0.1.5
PKG_REPOSITORY = https://github.com/siderolabs/pkgs.git PKG_REPOSITORY = https://github.com/siderolabs/pkgs.git
TALOS_REPOSITORY = https://github.com/siderolabs/talos.git TALOS_REPOSITORY = https://github.com/siderolabs/talos.git
SBCOVERLAY_REPOSITORY = https://github.com/talos-rpi5/sbc-raspberrypi5.git SBCOVERLAY_REPOSITORY = https://github.com/siderolabs/sbc-raspberrypi
CHECKOUTS_DIRECTORY := $(PWD)/checkouts CHECKOUTS_DIRECTORY := $(PWD)/checkouts
PATCHES_DIRECTORY := $(PWD)/patches PATCHES_DIRECTORY := $(PWD)/patches
PKGS_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/pkgs && git describe --tag --always --dirty --match v[0-9]\*) PKGS_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/pkgs && git describe --tag --always --dirty --match v[0-9]\*)
TALOS_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/talos && git describe --tag --always --dirty --match v[0-9]\*) TALOS_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/talos && git describe --tag --always --dirty --match v[0-9]\*)
SBCOVERLAY_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5 && git describe --tag --always --dirty)-$(PKGS_TAG) SBCOVERLAY_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/sbc-raspberrypi && git describe --tag --always --dirty --match v[0-9]\*)
# #
# Help # Help
@@ -37,17 +35,15 @@ SBCOVERLAY_TAG = $(shell cd $(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5 && git descr
.PHONY: help .PHONY: help
help: help:
@echo "checkouts : Clone repositories required for the build" @echo "checkouts : Clone repositories required for the build"
@echo "patches-pi5 : Apply all patches for Raspberry Pi 5" @echo "patches : Apply all patches for Raspberry Pi 5"
@echo "patches-pi4 : Apply all patches for Raspberry Pi 4"
@echo "kernel : Build kernel" @echo "kernel : Build kernel"
@echo "overlay : Build Raspberry Pi 5 overlay" @echo "overlay : Build Raspberry Pi 5 overlay"
@echo "imager : Build imager docker image" @echo "imager : Build imager docker image"
@echo "installer-base : Build installer-base docker image" @echo "installer-base : Build installer-base docker image"
@echo "kern_initramfs : Build kernel and initramfs" @echo "kern_initramfs : Build kernel and initramfs"
@echo "installer-pi5 : Build installer/image for Raspberry Pi 5" @echo "installer : Build installer"
@echo "installer-pi4 : Build installer/image for Raspberry Pi 4" @echo "image : Build disk image for Raspberry Pi 5"
@echo "pi5 : Full build pipeline for Raspberry Pi 5" @echo "pi5 : Full build pipeline for Raspberry Pi 5"
@echo "pi4 : Full build pipeline for Raspberry Pi 4"
@echo "release : Use only when building the final release, this will tag relevant images with the current Git tag." @echo "release : Use only when building the final release, this will tag relevant images with the current Git tag."
@echo "clean : Clean up any remains" @echo "clean : Clean up any remains"
@@ -58,41 +54,30 @@ help:
checkouts: checkouts:
git clone -c advice.detachedHead=false --branch "$(PKG_VERSION)" "$(PKG_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/pkgs" git clone -c advice.detachedHead=false --branch "$(PKG_VERSION)" "$(PKG_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/pkgs"
git clone -c advice.detachedHead=false --branch "$(TALOS_VERSION)" "$(TALOS_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/talos" git clone -c advice.detachedHead=false --branch "$(TALOS_VERSION)" "$(TALOS_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/talos"
git clone -c advice.detachedHead=false --branch "$(SBCOVERLAY_VERSION)" "$(SBCOVERLAY_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5" git clone -c advice.detachedHead=false --branch "$(SBCOVERLAY_VERSION)" "$(SBCOVERLAY_REPOSITORY)" "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi"
checkouts-clean: checkouts-clean:
rm -rf "$(CHECKOUTS_DIRECTORY)/pkgs" rm -rf "$(CHECKOUTS_DIRECTORY)/pkgs"
rm -rf "$(CHECKOUTS_DIRECTORY)/talos" rm -rf "$(CHECKOUTS_DIRECTORY)/talos"
rm -rf "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5" rm -rf "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi"
# #
# Patches # Patches
# #
.PHONY: patches-pkgs patches-talos patches patches-pkgs-4 patches-pi4 patches-pi5 .PHONY: patches-pkgs patches-talos patches patches
patches-pkgs: patches-pkgs:
cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \ cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
git am "$(PATCHES_DIRECTORY)/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch" git am "$(PATCHES_DIRECTORY)/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch"
cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
git apply $(PATCHES_DIRECTORY)/siderolabs/pkgs/0003-nf-bridge.patch
patches-talos: patches-talos:
cd "$(CHECKOUTS_DIRECTORY)/talos" && \ cd "$(CHECKOUTS_DIRECTORY)/talos" && \
git am "$(PATCHES_DIRECTORY)/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch" git am "$(PATCHES_DIRECTORY)/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch"
patches-pi5: patches-pkgs patches-talos patches: patches-pkgs patches-talos
patches-pkgs-4:
cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
git apply "$(PATCHES_DIRECTORY)/siderolabs/pkgs/0002-Patched-for-Raspberry-Pi-4.patch"
patches-pi4: patches-pkgs patches-pkgs-4 patches-talos
# Backwards-compatible alias # Backwards-compatible alias
patches: patches-pi5 patches: patches
#
# Kernel
#
.PHONY: kernel .PHONY: kernel
kernel: kernel:
cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \ cd "$(CHECKOUTS_DIRECTORY)/pkgs" && \
@@ -101,18 +86,15 @@ kernel:
PLATFORM=linux/arm64 \ PLATFORM=linux/arm64 \
kernel kernel
#
# Overlay
#
.PHONY: overlay .PHONY: overlay
overlay: overlay:
@echo SBCOVERLAY_TAG = $(SBCOVERLAY_TAG) @echo SBCOVERLAY_TAG = $(SBCOVERLAY_TAG)
cd "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi5" && \ cd "$(CHECKOUTS_DIRECTORY)/sbc-raspberrypi" && \
$(MAKE) \ $(MAKE) \
REGISTRY=$(REGISTRY) USERNAME=$(REGISTRY_USERNAME) IMAGE_TAG=$(SBCOVERLAY_TAG) PUSH=$(PUSH) \ REGISTRY=$(REGISTRY) USERNAME=$(REGISTRY_USERNAME) IMAGE_TAG=$(SBCOVERLAY_TAG) PUSH=$(PUSH) \
PKGS_PREFIX=$(REGISTRY)/$(REGISTRY_USERNAME) PKGS=$(PKGS_TAG) \ PKGS_PREFIX=$(REGISTRY)/$(REGISTRY_USERNAME) PKGS=$(PKGS_TAG) \
INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 \ INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 \
sbc-raspberrypi5 sbc-raspberrypi
.PHONY: imager .PHONY: imager
imager: imager:
@@ -141,39 +123,27 @@ kern_initramfs:
INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 SED=$(SED) \ INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 SED=$(SED) \
kernel initramfs kernel initramfs
#
# Installer/Image
#
.PHONY: installer-pi5
installer-pi5:
cd "$(CHECKOUTS_DIRECTORY)/talos" && \
docker \
run --rm -t -v ./_out:/out -v /dev:/dev --privileged $(REGISTRY)/$(REGISTRY_USERNAME)/imager:$(TALOS_TAG) \
$(ASSET_TYPE) --arch arm64 \
--base-installer-image="$(REGISTRY)/$(REGISTRY_USERNAME)/installer-base:$(TALOS_TAG)" \
--overlay-name="rpi5" \
--overlay-image="$(REGISTRY)/$(REGISTRY_USERNAME)/sbc-raspberrypi5:$(SBCOVERLAY_TAG)" \
$(EXTENSION_ARGS)
.PHONY: installer-pi4
installer-pi4:
cd "$(CHECKOUTS_DIRECTORY)/talos" && \
docker \
run --rm -t -v ./_out:/out -v /dev:/dev --privileged $(REGISTRY)/$(REGISTRY_USERNAME)/imager:$(TALOS_TAG) \
$(ASSET_TYPE) --arch arm64 \
--base-installer-image="$(REGISTRY)/$(REGISTRY_USERNAME)/installer-base:$(TALOS_TAG)" \
--overlay-name="rpi_generic" \
--overlay-image="$(SBCOVERLAY_PI4_IMAGE)" \
--overlay-option="configTxtAppend=$(CONFIG_TXT)" \
$(EXTENSION_ARGS)
# Backwards-compatible alias
.PHONY: installer .PHONY: installer
installer: installer-pi5 installer:
cd "$(CHECKOUTS_DIRECTORY)/talos" && \
$(MAKE) \
REGISTRY=$(REGISTRY) USERNAME=$(REGISTRY_USERNAME) PUSH=$(PUSH) \
PKG_KERNEL=$(REGISTRY)/$(REGISTRY_USERNAME)/kernel:$(PKGS_TAG) \
INSTALLER_ARCH=arm64 PLATFORM=linux/arm64 SED=$(SED) \
installer
.PHONY: image
image:
cd "$(CHECKOUTS_DIRECTORY)/talos" && \
docker \
run --rm -t -v ./_out:/out -v /dev:/dev --privileged $(REGISTRY)/$(REGISTRY_USERNAME)/imager:$(TALOS_TAG) \
$(ASSET_TYPE) --arch arm64 \
--base-installer-image="$(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG)" \
--overlay-name="rpi_5" \
--overlay-image="$(REGISTRY)/$(REGISTRY_USERNAME)/sbc-raspberrypi:$(SBCOVERLAY_TAG)" \
--overlay-option="configTxtAppend=$$CONFIG_TXT" \
$(EXTENSION_ARGS)
#
# Release
#
.PHONY: release .PHONY: release
release: release:
docker pull $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG) && \ docker pull $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TALOS_TAG) && \
@@ -181,13 +151,7 @@ release:
docker push $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TAG) docker push $(REGISTRY)/$(REGISTRY_USERNAME)/installer:$(TAG)
.PHONY: pi5 .PHONY: pi5
pi5: checkouts-clean checkouts patches-pi5 kernel kern_initramfs installer-base imager overlay installer-pi5 pi5: checkouts-clean checkouts patches kernel kern_initramfs installer-base imager overlay installer image
.PHONY: pi4
pi4: checkouts-clean checkouts patches-pi4 kernel kern_initramfs installer-base imager installer-pi4
#
# Clean
#
.PHONY: clean .PHONY: clean
clean: checkouts-clean clean: checkouts-clean
patches/siderolabs/pkgs/0001-Patched-for-Raspberry-Pi-5.patch
+210 -160
View File
File diff suppressed because it is too large Load Diff
patches/siderolabs/pkgs/0002-Patched-for-Raspberry-Pi-4.patch
-47
View File
@@ -1,47 +0,0 @@
diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
index 9b215b0..6cc483e 100644
--- a/kernel/build/config-arm64
+++ b/kernel/build/config-arm64
@@ -432,13 +432,13 @@ CONFIG_ROCKCHIP_ERRATUM_3588001=y
CONFIG_SOCIONEXT_SYNQUACER_PREITS=y
# end of ARM errata workarounds via the alternatives framework
-# CONFIG_ARM64_4K_PAGES is not set
-CONFIG_ARM64_16K_PAGES=y
+CONFIG_ARM64_4K_PAGES=y
+# CONFIG_ARM64_16K_PAGES is not set
# CONFIG_ARM64_64K_PAGES is not set
-# CONFIG_ARM64_VA_BITS_39 is not set
-CONFIG_ARM64_VA_BITS_48=y
+CONFIG_ARM64_VA_BITS_39=y
+# CONFIG_ARM64_VA_BITS_48 is not et
# CONFIG_ARM64_VA_BITS_52 is not set
-CONFIG_ARM64_VA_BITS=48
+CONFIG_ARM64_VA_BITS=39
CONFIG_ARM64_PA_BITS_48=y
CONFIG_ARM64_PA_BITS=48
# CONFIG_CPU_BIG_ENDIAN is not set
@@ -834,10 +834,10 @@ CONFIG_ARCH_WANTS_EXECMEM_LATE=y
CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y
CONFIG_SOFTIRQ_ON_OWN_STACK=y
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
-CONFIG_ARCH_MMAP_RND_BITS=18
-CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
+# CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+# CONFIG_ARCH_MMAP_RND_BITS is not set
+# CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+# CONFIG_ARCH_MMAP_RND_COMPAT_BITS is not set
CONFIG_HAVE_PAGE_SIZE_4KB=y
CONFIG_PAGE_SIZE_4KB=y
CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
@@ -3735,7 +3735,7 @@ CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
CONFIG_SERIAL_MVEBU_UART=y
CONFIG_SERIAL_MVEBU_CONSOLE=y
# CONFIG_SERIAL_OWL is not set
-# CONFIG_SERIAL_RPI_FW is not set
+CONFIG_SERIAL_RPI_FW=m
# end of Serial drivers
CONFIG_SERIAL_MCTRL_GPIO=y
patches/siderolabs/pkgs/0003-nf-bridge.patch
-13
View File
@@ -1,13 +0,0 @@
diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
index 9b215b0..6518d59 100644
--- a/kernel/build/config-arm64
+++ b/kernel/build/config-arm64
@@ -1633,7 +1633,7 @@ CONFIG_IP6_NF_NAT=y
# end of IPv6: Netfilter Configuration
CONFIG_NF_DEFRAG_IPV6=y
-# CONFIG_NF_TABLES_BRIDGE is not set
+CONFIG_NF_TABLES_BRIDGE=y
# CONFIG_NF_CONNTRACK_BRIDGE is not set
CONFIG_BRIDGE_NF_EBTABLES_LEGACY=y
CONFIG_BRIDGE_NF_EBTABLES=y
patches/siderolabs/talos/0001-Patched-for-Raspberry-Pi-5.patch
+32 -7
View File
@@ -1,17 +1,18 @@
From 87c9e57548bc0aef15d67967a68cc9185216361d Mon Sep 17 00:00:00 2001 From aa8dc47f5a43480ea174c79c1c11873fd05b9efe Mon Sep 17 00:00:00 2001
From: Patrick Hunziker <patrick@hunziker.io> From: Patrick Hunziker <patrick@hunziker.io>
Date: Sat, 8 Nov 2025 11:31:15 +0100 Date: Sat, 8 Nov 2025 11:31:15 +0100
Subject: [PATCH] [PATCH] Patched for Raspberry Pi 5 Subject: [PATCH] Patched for Raspberry Pi 5
--- ---
hack/modules-arm64.txt | 343 +++++++++++++++++++---------------------- hack/modules-arm64.txt | 368 ++++++++++++++++++-----------------------
1 file changed, 160 insertions(+), 183 deletions(-) 1 file changed, 160 insertions(+), 208 deletions(-)
diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt
index 6c48a7465..95c3ee669 100644 index 8df29effd..95c3ee669 100644
--- a/hack/modules-arm64.txt --- a/hack/modules-arm64.txt
+++ b/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt
@@ -1,213 +1,190 @@ @@ -1,238 +1,190 @@
-kernel/arch/arm64/lib/xor-neon.ko
+modules.builtin.bin +modules.builtin.bin
+modules.builtin.modinfo +modules.builtin.modinfo
+modules.builtin.alias.bin +modules.builtin.alias.bin
@@ -32,6 +33,7 @@ index 6c48a7465..95c3ee669 100644
kernel/crypto/async_tx/async_raid6_recov.ko kernel/crypto/async_tx/async_raid6_recov.ko
kernel/crypto/async_tx/async_tx.ko kernel/crypto/async_tx/async_tx.ko
-kernel/crypto/async_tx/async_xor.ko -kernel/crypto/async_tx/async_xor.ko
-kernel/crypto/hkdf.ko
-kernel/crypto/xor.ko -kernel/crypto/xor.ko
-kernel/drivers/acpi/video.ko -kernel/drivers/acpi/video.ko
-kernel/drivers/ata/ahci.ko -kernel/drivers/ata/ahci.ko
@@ -53,9 +55,10 @@ index 6c48a7465..95c3ee669 100644
+kernel/drivers/infiniband/hw/hns/hns-roce-hw-v2.ko +kernel/drivers/infiniband/hw/hns/hns-roce-hw-v2.ko
+kernel/drivers/misc/bcm2835_smi.ko +kernel/drivers/misc/bcm2835_smi.ko
kernel/drivers/crypto/tegra/tegra-se.ko kernel/drivers/crypto/tegra/tegra-se.ko
-kernel/drivers/gpu/drm/display/drm_dp_aux_bus.ko
-kernel/drivers/gpu/drm/drm_buddy.ko -kernel/drivers/gpu/drm/drm_buddy.ko
-kernel/drivers/gpu/drm/drm_exec.ko -kernel/drivers/gpu/drm/drm_exec.ko
-kernel/drivers/gpu/drm/drm_gpuvm.ko
-kernel/drivers/gpu/drm/drm_panel_backlight_quirks.ko
-kernel/drivers/gpu/drm/drm_suballoc_helper.ko -kernel/drivers/gpu/drm/drm_suballoc_helper.ko
+kernel/drivers/acpi/video.ko +kernel/drivers/acpi/video.ko
+kernel/drivers/gpu/drm/vc4/vc4.ko +kernel/drivers/gpu/drm/vc4/vc4.ko
@@ -108,12 +111,15 @@ index 6c48a7465..95c3ee669 100644
-kernel/drivers/infiniband/hw/mlx4/mlx4_ib.ko -kernel/drivers/infiniband/hw/mlx4/mlx4_ib.ko
-kernel/drivers/infiniband/hw/mlx5/mlx5_ib.ko -kernel/drivers/infiniband/hw/mlx5/mlx5_ib.ko
-kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko -kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko
-kernel/drivers/irqchip/irq-bcm2712-mip.ko
-kernel/drivers/irqchip/irq-imx-mu-msi.ko -kernel/drivers/irqchip/irq-imx-mu-msi.ko
-kernel/drivers/leds/led-class-multicolor.ko
-kernel/drivers/mailbox/bcm-flexrm-mailbox.ko -kernel/drivers/mailbox/bcm-flexrm-mailbox.ko
-kernel/drivers/md/bcache/bcache.ko -kernel/drivers/md/bcache/bcache.ko
-kernel/drivers/md/dm-bio-prison.ko -kernel/drivers/md/dm-bio-prison.ko
-kernel/drivers/md/dm-cache-smq.ko -kernel/drivers/md/dm-cache-smq.ko
-kernel/drivers/md/dm-cache.ko -kernel/drivers/md/dm-cache.ko
-kernel/drivers/md/dm-integrity.ko
-kernel/drivers/md/dm-multipath.ko -kernel/drivers/md/dm-multipath.ko
-kernel/drivers/md/dm-raid.ko -kernel/drivers/md/dm-raid.ko
-kernel/drivers/md/dm-round-robin.ko -kernel/drivers/md/dm-round-robin.ko
@@ -133,6 +139,7 @@ index 6c48a7465..95c3ee669 100644
-kernel/drivers/mmc/host/sdhci-pci.ko -kernel/drivers/mmc/host/sdhci-pci.ko
-kernel/drivers/mmc/host/sdhci-pltfm.ko -kernel/drivers/mmc/host/sdhci-pltfm.ko
-kernel/drivers/mmc/host/sdhci-tegra.ko -kernel/drivers/mmc/host/sdhci-tegra.ko
-kernel/drivers/mmc/host/sdhci-uhs2.ko
-kernel/drivers/mmc/host/sdhci-xenon-driver.ko -kernel/drivers/mmc/host/sdhci-xenon-driver.ko
+kernel/drivers/nvme/host/nvme-rdma.ko +kernel/drivers/nvme/host/nvme-rdma.ko
+kernel/drivers/nvme/target/nvme-loop.ko +kernel/drivers/nvme/target/nvme-loop.ko
@@ -189,12 +196,16 @@ index 6c48a7465..95c3ee669 100644
-kernel/drivers/net/ethernet/intel/i40e/i40e.ko -kernel/drivers/net/ethernet/intel/i40e/i40e.ko
-kernel/drivers/net/ethernet/intel/iavf/iavf.ko -kernel/drivers/net/ethernet/intel/iavf/iavf.ko
-kernel/drivers/net/ethernet/intel/ice/ice.ko -kernel/drivers/net/ethernet/intel/ice/ice.ko
-kernel/drivers/net/ethernet/intel/idpf/idpf.ko
-kernel/drivers/net/ethernet/intel/igb/igb.ko -kernel/drivers/net/ethernet/intel/igb/igb.ko
-kernel/drivers/net/ethernet/intel/igbvf/igbvf.ko -kernel/drivers/net/ethernet/intel/igbvf/igbvf.ko
-kernel/drivers/net/ethernet/intel/igc/igc.ko -kernel/drivers/net/ethernet/intel/igc/igc.ko
-kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko -kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
-kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko -kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
-kernel/drivers/net/ethernet/intel/libeth/libeth_xdp.ko
-kernel/drivers/net/ethernet/intel/libeth/libeth.ko -kernel/drivers/net/ethernet/intel/libeth/libeth.ko
-kernel/drivers/net/ethernet/intel/libie/libie_adminq.ko
-kernel/drivers/net/ethernet/intel/libie/libie_fwlog.ko
-kernel/drivers/net/ethernet/intel/libie/libie.ko -kernel/drivers/net/ethernet/intel/libie/libie.ko
-kernel/drivers/net/ethernet/marvell/sky2.ko -kernel/drivers/net/ethernet/marvell/sky2.ko
-kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko -kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
@@ -220,6 +231,7 @@ index 6c48a7465..95c3ee669 100644
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.ko -kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson.ko
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.ko -kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.ko
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.ko -kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.ko
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.ko
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.ko -kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.ko
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.ko -kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.ko
-kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.ko -kernel/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.ko
@@ -315,18 +327,30 @@ index 6c48a7465..95c3ee669 100644
-kernel/drivers/usb/serial/cp210x.ko -kernel/drivers/usb/serial/cp210x.ko
-kernel/drivers/usb/serial/ftdi_sio.ko -kernel/drivers/usb/serial/ftdi_sio.ko
-kernel/drivers/usb/serial/pl2303.ko -kernel/drivers/usb/serial/pl2303.ko
-kernel/drivers/vdpa/mlx5/mlx5_vdpa.ko
-kernel/drivers/vdpa/octeon_ep/octep_vdpa.ko
-kernel/drivers/vdpa/solidrun/snet_vdpa.ko
-kernel/drivers/vdpa/vdpa_sim/vdpa_sim_blk.ko
-kernel/drivers/vdpa/vdpa_sim/vdpa_sim_net.ko
-kernel/drivers/vdpa/vdpa_sim/vdpa_sim.ko
-kernel/drivers/vdpa/vdpa_user/vduse.ko
-kernel/drivers/vdpa/vdpa.ko
-kernel/drivers/vdpa/virtio_pci/vp_vdpa.ko
-kernel/drivers/vfio/pci/vfio-pci-core.ko -kernel/drivers/vfio/pci/vfio-pci-core.ko
+kernel/drivers/thunderbolt/thunderbolt.ko +kernel/drivers/thunderbolt/thunderbolt.ko
kernel/drivers/vfio/pci/vfio-pci.ko kernel/drivers/vfio/pci/vfio-pci.ko
-kernel/drivers/vfio/vfio_iommu_type1.ko -kernel/drivers/vfio/vfio_iommu_type1.ko
+kernel/drivers/vfio/pci/vfio-pci-core.ko +kernel/drivers/vfio/pci/vfio-pci-core.ko
kernel/drivers/vfio/vfio.ko kernel/drivers/vfio/vfio.ko
-kernel/drivers/vhost/vhost_vdpa.ko
-kernel/drivers/vhost/vringh.ko
-kernel/drivers/virtio/virtio_balloon.ko -kernel/drivers/virtio/virtio_balloon.ko
-kernel/drivers/virtio/virtio_input.ko -kernel/drivers/virtio/virtio_input.ko
-kernel/drivers/virtio/virtio_mmio.ko -kernel/drivers/virtio/virtio_mmio.ko
-kernel/drivers/virtio/virtio_pci_legacy_dev.ko -kernel/drivers/virtio/virtio_pci_legacy_dev.ko
-kernel/drivers/virtio/virtio_pci_modern_dev.ko -kernel/drivers/virtio/virtio_pci_modern_dev.ko
-kernel/drivers/virtio/virtio_pci.ko -kernel/drivers/virtio/virtio_pci.ko
-kernel/drivers/virtio/virtio_vdpa.ko
+kernel/drivers/vfio/vfio_iommu_type1.ko +kernel/drivers/vfio/vfio_iommu_type1.ko
+kernel/drivers/usb/class/cdc-wdm.ko +kernel/drivers/usb/class/cdc-wdm.ko
+kernel/drivers/usb/serial/usb_wwan.ko +kernel/drivers/usb/serial/usb_wwan.ko
@@ -370,6 +394,7 @@ index 6c48a7465..95c3ee669 100644
kernel/lib/parman.ko kernel/lib/parman.ko
-kernel/lib/raid6/raid6_pq.ko -kernel/lib/raid6/raid6_pq.ko
-kernel/net/ipv4/ip_gre.ko -kernel/net/ipv4/ip_gre.ko
-kernel/net/ipv6/ip6_gre.ko
-kernel/net/openvswitch/vport-gre.ko -kernel/net/openvswitch/vport-gre.ko
-kernel/net/tls/tls.ko -kernel/net/tls/tls.ko
+kernel/fs/btrfs/btrfs.ko +kernel/fs/btrfs/btrfs.ko