LU-13120 build: Fix ZFS dependancies for osd-zfs-mount

lustre-osd-zfs-mount depends on zfs
lustre-osd-zfs-mount depends on kmod-lustre-osd-zfs

SuSE packaging style prefers kmp package naming so prepare
for adopting a kmp named zfs package

Test-Parameters: trivial
Cray-bug-id: LUS-7077
Signed-off-by: Shaun Tancheff <stancheff@cray.com>
Change-Id: I510a46dd3d0e6d58a1e0db36226d412ee06016ec
Reviewed-on: https://review.whamcloud.com/37169
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Olaf Faaland-LLNL <faaland1@llnl.gov>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index f23dca2..6d09e2d 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -92,6 +92,8 @@
 %if %{_vendor}=="redhat" || %{_vendor}=="fedora"
        %global requires_yaml_name libyaml
        %global requires_kmod_name kmod-%{lustre_name}
+       %global requires_kmod_osd_zfs_name kmod-%{lustre_name}-osd-zfs
+       %global requires_kmod_zfs_name kmod-zfs
        %if %{with lustre_tests}
                %global requires_kmod_tests_name kmod-%{lustre_name}-tests
        %endif
@@ -99,6 +101,8 @@
 %else  #for Suse
        %global requires_yaml_name libyaml-0-2
        %global requires_kmod_name %{lustre_name}-kmp
+       %global requires_kmod_osd_zfs_name %{lustre_name}-osd-zfs-kmp
+       %global requires_kmod_zfs_name kmod-zfs
        %if %{with lustre_tests}
                %global requires_kmod_tests_name %{lustre_name}-tests-kmp
        %endif
@@ -228,6 +232,9 @@ LDISKFS hooks for mount/mkfs into a dynamic library.
 %package osd-zfs-mount
 Summary: osd-zfs-mount contains mount's zfs specific dso.
 Provides: lustre-osd-mount = %{version}
+Requires: zfs
+Requires: %{requires_kmod_zfs_name}
+Requires: %{requires_kmod_osd_zfs_name}
 Group: System Environment/Kernel
 
 %description osd-zfs-mount

diff --git a/rpm/kmp-lustre-osd-zfs.preamble b/rpm/kmp-lustre-osd-zfs.preamble
index c8db093..e17709c 100644 (file)
--- a/rpm/kmp-lustre-osd-zfs.preamble
+++ b/rpm/kmp-lustre-osd-zfs.preamble
@@ -1,4 +1,4 @@
-Requires:       zfs-kmod
+Summary:        Lustre osd-zfs feature support
 Requires:       %{name}-osd-zfs-mount = %{version}
 Provides:       %{name}-osd = %{version}
 Obsoletes:      %{name}-osd-zfs < %{version}