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: fstype=zfs
Cray-bug-id: LUS-7077
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Ifcee1fa90bf95925cbcff0975d95f12ae04f670d
Reviewed-on: https://review.whamcloud.com/37809
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Sergey Cheremencev <sergey.cheremencev@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index 767d284..8869a50 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -108,6 +108,7 @@
 %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
        %if %{with lustre_tests}
                %global requires_kmod_tests_name kmod-%{lustre_name}-tests
        %endif
@@ -115,6 +116,7 @@
 %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
        %if %{with lustre_tests}
                %global requires_kmod_tests_name %{lustre_name}-tests-kmp
        %endif
@@ -263,6 +265,9 @@ LDISKFS hooks for mount/mkfs into a dynamic library.
 Summary: osd-zfs-mount contains mount's zfs specific dso.
 Provides: lustre-osd-mount = %{version}
 Obsoletes: lustre-osd-mount < %{version}
+# Tests also require zpool from zfs package:
+Requires: zfs
+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 50ba25b..e17709c 100644 (file)
--- a/rpm/kmp-lustre-osd-zfs.preamble
+++ b/rpm/kmp-lustre-osd-zfs.preamble
@@ -1,4 +1,4 @@
-Requires:       zfs-kmod
-Requires:       lustre-osd-zfs-mount = %{version}
-Provides:       lustre-osd = %{version}
-Obsoletes:      lustre-osd-zfs < %{version}
+Summary:        Lustre osd-zfs feature support
+Requires:       %{name}-osd-zfs-mount = %{version}
+Provides:       %{name}-osd = %{version}
+Obsoletes:      %{name}-osd-zfs < %{version}