From d4521ee9c472622fb2ef3c8570c1fa1c46332c16 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 13 Feb 2024 14:30:39 +0400 Subject: [PATCH] feat: update kernel with sfc driver and LSM updates See: * https://github.com/siderolabs/pkgs/pull/890 * https://github.com/siderolabs/pkgs/pull/891 Signed-off-by: Andrey Smirnov --- Makefile | 2 +- hack/modules-amd64.txt | 7 ++++--- hack/modules-arm64.txt | 7 ++++--- pkg/machinery/gendata/data/pkgs | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5b7e77fff7..25653227a3 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ ARTIFACTS := _out TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-alpha.0-6-gb6b4d9e PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.7.0-alpha.0-22-g0ec4cc3 +PKGS ?= v1.7.0-alpha.0-24-g510a3f9 EXTRAS ?= v1.7.0-alpha.0-1-gc4934e1 PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS) diff --git a/hack/modules-amd64.txt b/hack/modules-amd64.txt index 72d83b7f8e..052b04cccf 100644 --- a/hack/modules-amd64.txt +++ b/hack/modules-amd64.txt @@ -1,6 +1,3 @@ -modules.order -modules.builtin -modules.builtin.modinfo kernel/crypto/async_tx/async_memcpy.ko kernel/crypto/async_tx/async_pq.ko kernel/crypto/async_tx/async_raid6_recov.ko @@ -108,6 +105,7 @@ kernel/drivers/net/ethernet/qlogic/qede/qede.ko kernel/drivers/net/ethernet/qlogic/qlcnic/qlcnic.ko kernel/drivers/net/ethernet/realtek/8139too.ko kernel/drivers/net/ethernet/realtek/r8169.ko +kernel/drivers/net/ethernet/sfc/sfc.ko kernel/drivers/net/ethernet/sfc/siena/sfc-siena.ko kernel/drivers/net/mdio.ko kernel/drivers/net/mii.ko @@ -140,3 +138,6 @@ kernel/lib/parman.ko kernel/lib/raid6/raid6_pq.ko kernel/net/ipv4/ip_gre.ko kernel/net/openvswitch/vport-gre.ko +modules.builtin +modules.builtin.modinfo +modules.order diff --git a/hack/modules-arm64.txt b/hack/modules-arm64.txt index 00fa95e778..ec30df03f9 100644 --- a/hack/modules-arm64.txt +++ b/hack/modules-arm64.txt @@ -1,6 +1,3 @@ -modules.order -modules.builtin -modules.builtin.modinfo kernel/crypto/async_tx/async_memcpy.ko kernel/crypto/async_tx/async_pq.ko kernel/crypto/async_tx/async_raid6_recov.ko @@ -32,6 +29,7 @@ kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_i2c.ko kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_minimal.ko kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_pci.ko kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_spectrum.ko +kernel/drivers/net/ethernet/sfc/sfc.ko kernel/drivers/net/ethernet/sfc/siena/sfc-siena.ko kernel/drivers/vfio/pci/vfio-pci-core.ko kernel/drivers/vfio/pci/vfio-pci.ko @@ -42,3 +40,6 @@ kernel/lib/parman.ko kernel/lib/raid6/raid6_pq.ko kernel/net/ipv4/ip_gre.ko kernel/net/openvswitch/vport-gre.ko +modules.builtin +modules.builtin.modinfo +modules.order diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index 9513446227..563e2abbe1 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.7.0-alpha.0-22-g0ec4cc3 \ No newline at end of file +v1.7.0-alpha.0-24-g510a3f9 \ No newline at end of file