From: Andreas Dilger <adilger@whamcloud.com>
Date: Thu, 23 Jan 2020 23:02:35 +0000 (+0000)
Subject: Revert "LU-13120 build: Fix ZFS dependancies for osd-zfs-mount"
X-Git-Tag: 2.13.52~77
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F20%2F37320%2F3;p=fs%2Flustre-release.git

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

This reverts commit fb687e35402fa6755589657a67dbe30be09ba9c5.

All review-dne-zfs-part-[1234] sessions fail with the most recent
master landings, and this seems like the likely culprit.

Change-Id: Id0295d65a642e7c2ef6367dac72d89acfca8a6b4
Reviewed-on: https://review.whamcloud.com/37320
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre.spec.in b/lustre.spec.in
index 6d09e2d..f23dca2 100644
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -92,8 +92,6 @@
 %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
@@ -101,8 +99,6 @@
 %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
@@ -232,9 +228,6 @@ 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 e17709c..c8db093 100644
--- a/rpm/kmp-lustre-osd-zfs.preamble
+++ b/rpm/kmp-lustre-osd-zfs.preamble
@@ -1,4 +1,4 @@
-Summary:        Lustre osd-zfs feature support
+Requires:       zfs-kmod
 Requires:       %{name}-osd-zfs-mount = %{version}
 Provides:       %{name}-osd = %{version}
 Obsoletes:      %{name}-osd-zfs < %{version}