summaryrefslogtreecommitdiffstats
path: root/rpm/generic
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-03-19 15:55:44 -0700
committerBrian Behlendorf <[email protected]>2013-03-19 16:17:04 -0700
commitc0c3d83ccb3ff89c6183a3f160c05adad5805148 (patch)
tree0821318985cd43748a2464007cbfcd096e52d7c6 /rpm/generic
parentac826e16682114ee7a41b7a4ca3d8fdde59d29dc (diff)
Add spl-dkms dependency to zfs-dkms
Adding the 'spl-dkms = VERSION' dependency to the zfs-dkms package ensures the spl will be installed before zfs. This cleanly handles the initial 'yum localinstall' case. However, this does not address the dkms rebuilds caused by a new kernel being installed. For that we still rely on the clunky --with-spl-timeout=<timeout> configure option which allows the zfs compilation to be briefly delayed while the spl components are built. Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'rpm/generic')
-rw-r--r--rpm/generic/zfs-dkms.spec.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in
index 3713b1a90..445c390bf 100644
--- a/rpm/generic/zfs-dkms.spec.in
+++ b/rpm/generic/zfs-dkms.spec.in
@@ -15,6 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: dkms >= 2.2.0.2
+Requires: spl-dkms = @VERSION@
Provides: %{module}-kmod = %{version}
Conflicts: %{module}-kmod