From 7ec7f5af236c4bdd8f08b9a2a00453ae8189eee6 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Fri, 28 Jan 2022 15:15:00 +0700 Subject: [PATCH] LU-13906 build: Fix %{name}-osd-ldiskfs-mount The following error occurs during installation: error: Failed dependencies: lustre-osd-ldiskfs-mount = 2.14.57_56_g4d94d2f is needed by kmod-lustre_ib-osd-ldiskfs-2.14.57_56_g4d94d2f-1.el8.x86_64 Test-Parameters: trivial Signed-off-by: Shaun Tancheff Change-Id: Idbcdbd5a1e7793c1359f90c1035ded9fe8e90576 Reviewed-on: https://review.whamcloud.com/46341 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Petros Koutoupis Reviewed-by: Oleg Drokin --- lustre.spec.in | 4 ++-- rpm/kmp-lustre-osd-ldiskfs.preamble | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre.spec.in b/lustre.spec.in index 65aa4fb..b67b4a2 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -204,8 +204,8 @@ BuildRequires: pkg-config BuildRequires: krb5-devel openssl-devel %endif %if %{with servers} -Requires: lustre-osd -Requires: lustre-osd-mount +Requires: %{name}-osd +Requires: %{name}-osd-mount Obsoletes: lustre-server < %{version} Provides: lustre-server = %{version}-%{release} %endif diff --git a/rpm/kmp-lustre-osd-ldiskfs.preamble b/rpm/kmp-lustre-osd-ldiskfs.preamble index e54b383..680373f 100644 --- a/rpm/kmp-lustre-osd-ldiskfs.preamble +++ b/rpm/kmp-lustre-osd-ldiskfs.preamble @@ -1,8 +1,8 @@ Requires: %{requires_kmod_name} = %{requires_kmod_version} Requires: ldiskfsprogs >= 1.44.3.wc1 -Requires: lustre-osd-ldiskfs-mount = %{version} -Provides: lustre-osd = %{version} +Requires: %{name}-osd-ldiskfs-mount = %{version} Provides: %{name}-osd = %{version} +Provides: lustre-osd = %{version} Obsoletes: %{name}-ldiskfs < %{version} Obsoletes: %{name}-osd-ldiskfs < %{version} Obsoletes: lustre-ldiskfs < %{version} -- 1.8.3.1