From 20ad3ed15c321c7740988728c49a97105c59a3c4 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Wed, 28 Mar 2018 14:07:45 -0400 Subject: [PATCH] LU-10858 build: handle yaml library packaging on SLES systems Newer distributions like SLES12 renamed the libyaml package to libyaml-0-2. Update the spec file to handle this change. Test-Parameters: clientdistro=sles12sp3 \ ossdistro=sles12sp3 mdsdistro=sles12sp3 \ testlist=sanity,sanity-pfl,sanity-flr Change-Id: I876d05718194dd555d7d6ffa6433bcc9f445f97e Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/31815 Reviewed-by: Jian Yu Tested-by: Jenkins Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre.spec.in b/lustre.spec.in index d3a5dd6..1ce962b 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -81,12 +81,14 @@ %global modules_fs_path /lib/modules/%{kversion}/%{kmoddir} %if %{_vendor}=="redhat" || %{_vendor}=="fedora" + %global requires_yaml_name libyaml %global requires_kmod_name kmod-%{lustre_name} %if %{with lustre_tests} %global requires_kmod_tests_name kmod-%{lustre_name}-tests %endif %global requires_kmod_version %{version} %else #for Suse + %global requires_yaml_name libyaml-0-2 %global requires_kmod_name %{lustre_name}-kmp %if %{with lustre_tests} %global requires_kmod_tests_name %{lustre_name}-tests-kmp @@ -132,7 +134,8 @@ Source6: kmp-lustre-osd-zfs.files Source7: kmp-lustre-tests.files URL: https://wiki.hpdd.intel.com/ BuildRoot: %{_tmppath}/lustre-%{version}-root -Requires: %{requires_kmod_name} = %{requires_kmod_version} libyaml zlib +Requires: %{requires_kmod_name} = %{requires_kmod_version} zlib +Requires: %{requires_yaml_name} BuildRequires: libtool libyaml-devel zlib-devel %if %{with servers} Requires: lustre-osd -- 1.8.3.1