From 3ef670a9e8e7efff5af9872e1e13d8521ce2dca6 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Fri, 15 Sep 2023 15:03:27 +0200 Subject: [PATCH] chore: pull in dm modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pull in dm-modules. Ref: https://github.com/siderolabs/pkgs/pull/791 Diff: ```bash ❯ diff -r --color _out/kernel-a/lib/modules/6.1.51-talos/modules.dep _out/kernel-b/lib/modules/6.1.51-talos/modules.dep 100a101 > kernel/drivers/md/dm-bio-prison.ko: 102a104 > kernel/drivers/md/persistent-data/dm-persistent-data.ko: 103a106 > kernel/drivers/md/dm-thin-pool.ko: kernel/drivers/md/persistent-data/dm-persistent-data.ko kernel/drivers/md/dm-bio-prison.ko ``` Signed-off-by: Noel Georgi --- Makefile | 2 +- hack/modules-amd64.txt | 9 ++++++--- hack/modules-arm64.txt | 9 ++++++--- pkg/machinery/gendata/data/pkgs | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index fcf5ce9735..2a23c72591 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ CLOUD_IMAGES_EXTRA_ARGS ?= "" ARTIFACTS := _out TOOLS ?= ghcr.io/siderolabs/tools:v1.6.0-alpha.0-1-gfa388de -PKGS ?= v1.6.0-alpha.0-12-g518c441 +PKGS ?= v1.6.0-alpha.0-15-g847a9c3 PKG_KERNEL ?= ghcr.io/siderolabs/kernel:$(PKGS) EXTRAS ?= v1.6.0-alpha.0 # renovate: datasource=github-tags depName=golang/go diff --git a/hack/modules-amd64.txt b/hack/modules-amd64.txt index f2aa71265f..127379e59f 100644 --- a/hack/modules-amd64.txt +++ b/hack/modules-amd64.txt @@ -7,11 +7,14 @@ kernel/crypto/async_tx/async_raid6_recov.ko kernel/crypto/async_tx/async_tx.ko kernel/crypto/async_tx/async_xor.ko kernel/crypto/xor.ko +kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko +kernel/drivers/md/dm-bio-prison.ko kernel/drivers/md/dm-multipath.ko kernel/drivers/md/dm-raid.ko kernel/drivers/md/dm-round-robin.ko +kernel/drivers/md/dm-thin-pool.ko +kernel/drivers/md/persistent-data/dm-persistent-data.ko kernel/drivers/md/raid456.ko -kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko kernel/drivers/net/ethernet/aquantia/atlantic/atlantic.ko kernel/drivers/net/ethernet/atheros/alx/alx.ko kernel/drivers/net/ethernet/broadcom/bnx2.ko @@ -20,9 +23,9 @@ kernel/drivers/net/ethernet/broadcom/bnxt/bnxt_en.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 +kernel/drivers/net/ethernet/intel/e100.ko kernel/drivers/net/ethernet/intel/e1000/e1000.ko kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko -kernel/drivers/net/ethernet/intel/e100.ko kernel/drivers/net/ethernet/intel/i40e/i40e.ko kernel/drivers/net/ethernet/intel/iavf/iavf.ko kernel/drivers/net/ethernet/intel/ice/ice.ko @@ -58,9 +61,9 @@ kernel/drivers/scsi/vmw_pvscsi.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/drivers/virtio/virtio_pci.ko kernel/lib/objagg.ko kernel/lib/parman.ko kernel/lib/raid6/raid6_pq.ko diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt index 9bcd066b9d..4af719d355 100644 --- a/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt @@ -7,13 +7,16 @@ kernel/crypto/async_tx/async_raid6_recov.ko kernel/crypto/async_tx/async_tx.ko kernel/crypto/async_tx/async_xor.ko kernel/crypto/xor.ko +kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko +kernel/drivers/irqchip/irq-imx-mu-msi.ko +kernel/drivers/mailbox/bcm-flexrm-mailbox.ko +kernel/drivers/md/dm-bio-prison.ko kernel/drivers/md/dm-multipath.ko kernel/drivers/md/dm-raid.ko kernel/drivers/md/dm-round-robin.ko +kernel/drivers/md/dm-thin-pool.ko +kernel/drivers/md/persistent-data/dm-persistent-data.ko kernel/drivers/md/raid456.ko -kernel/drivers/infiniband/sw/rxe/rdma_rxe.ko -kernel/drivers/irqchip/irq-imx-mu-msi.ko -kernel/drivers/mailbox/bcm-flexrm-mailbox.ko kernel/drivers/net/ethernet/atheros/alx/alx.ko kernel/drivers/net/ethernet/google/gve/gve.ko kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index ff73ea14dc..8acc2f1e61 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.6.0-alpha.0-12-g518c441 \ No newline at end of file +v1.6.0-alpha.0-15-g847a9c3 \ No newline at end of file