From afaf9414ff2b17dcf2c08bbdf2b8fedf358ff607 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Tue, 22 Dec 2020 04:14:32 +0000 Subject: [PATCH] zfs-kmods: install to /lib/modules instead of /usr/lib/modules Before this patch, dracut wouldn't find zfs.ko for inclusion in initramfs. This was caused by the packages installing in to /lib/modules instead of /usr/lib/modules. Correcting this allows dracut to do the right thing, even without # /etc/dracut.conf add_drivers+=" zfs " Notably, rpm/redhat/zfs-kmod.spec.in does not contain the definition of the `prefix` macro that this commit removes in the generic kmod spec. And https://rpmfusion.org/Packaging/KernelModules/Kmods2 does not mention `prefix` at all. Reviewed-by: Brian Behlendorf Signed-off-by: Christian Schwarz Closes #11381 --- rpm/generic/zfs-kmod.spec.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in index 782ad465e..6e4bfdcfe 100644 --- a/rpm/generic/zfs-kmod.spec.in +++ b/rpm/generic/zfs-kmod.spec.in @@ -88,10 +88,6 @@ BuildRequires: %{_bindir}/kmodtool %global __global_ldflags %{nil} %endif -%if 0%{?fedora} >= 17 -%define prefix /usr -%endif - # Kmodtool does its magic here. A patched version of kmodtool is shipped # with the source rpm until kmod development packages are supported upstream. # https://bugzilla.rpmfusion.org/show_bug.cgi?id=2714 -- 2.39.2