From fc8577c9fa41978d395c8ffe1588f2616f11d2e5 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 15 Oct 2023 16:05:10 +0200 Subject: [PATCH] d/rules: adapt to merge of ZFS kernel modules Following ZFS commit ad9e76765 ("linux: module: weld all but spl.ko into zfs.ko") we only have two modules to care about. Signed-off-by: Thomas Lamprecht --- debian/rules | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 8a88a7d..cc5f47f 100755 --- a/debian/rules +++ b/debian/rules @@ -157,7 +157,7 @@ binary: install $(MAKE) -C $(KERNEL_SRC) INSTALL_MOD_PATH=$(BUILD_DIR)/debian/$(PMX_KERNEL_PKG)/ modules_install # install zfs drivers install -d -m 0755 debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs - install -m 644 $(addprefix $(MODULES)/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs + install -m 644 $(MODULES)/zfs.ko $(MODULES)/spl.ko debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME)/zfs # remove firmware rm -rf debian/$(PMX_KERNEL_PKG)/lib/firmware @@ -282,15 +282,8 @@ $(MODULES)/zfs.ko: .compile_mark cd $(MODULES)/$(ZFSDIR); ./autogen.sh cd $(MODULES)/$(ZFSDIR); ./configure --with-config=kernel --with-linux=$(BUILD_DIR)/$(KERNEL_SRC) --with-linux-obj=$(BUILD_DIR)/$(KERNEL_SRC) $(MAKE) -C $(MODULES)/$(ZFSDIR) - cp $(MODULES)/$(ZFSDIR)/module/avl/zavl.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/nvpair/znvpair.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/unicode/zunicode.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/zcommon/zcommon.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/icp/icp.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/zfs/zfs.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/lua/zlua.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/spl/spl.ko $(MODULES)/ - cp $(MODULES)/$(ZFSDIR)/module/zstd/zzstd.ko $(MODULES)/ + cp $(MODULES)/$(ZFSDIR)/module/zfs.ko $(MODULES)/ + cp $(MODULES)/$(ZFSDIR)/module/spl.ko $(MODULES)/ fwlist-$(KVNAME): .compile_mark .modules_compile_mark debian/scripts/find-firmware.pl debian/$(PMX_KERNEL_PKG)/lib/modules/$(KVNAME) >fwlist.tmp