From e3843b18d32e58b4b28d16365f68808cf9d7ddbc Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Fri, 28 Jan 2022 15:13:10 +0700 Subject: [PATCH] LU-13906 build: consistent use of %{name} Make the of the %{name} macro consistent across lustre packages Fixes: cfaf0eb92005 ("LU-12214 build: fixes if the name is not just 'lustre'") Test-Parameters: trivial HPE-bug-id: LUS-5914, LUS-5915 Signed-off-by: Shaun Tancheff Change-Id: I71c0a0e77a0fc7319a166311e33d3ca9de60e499 Reviewed-on: https://review.whamcloud.com/39662 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Petros Koutoupis Reviewed-by: Chris Horn Reviewed-by: Oleg Drokin --- lustre.spec.in | 10 +++++++--- rpm/kmp-lustre-osd-ldiskfs.preamble | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lustre.spec.in b/lustre.spec.in index 1995358..24d861b 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -278,6 +278,8 @@ Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. BuildRequires: e2fsprogs-devel >= 1.44.3 Requires: ldiskfsprogs >= 1.45.6.wc1 Provides: lustre-osd-mount = %{version} +Provides: %{name}-osd-mount = %{version} +Obsoletes: %{name}-osd-mount < %{version} Obsoletes: lustre-osd-mount < %{version} Group: System Environment/Kernel @@ -292,7 +294,7 @@ LDISKFS hooks for mount/mkfs into a dynamic library. %if %{with lustre_utils} %package osd-zfs-mount Summary: osd-zfs-mount contains mount's zfs specific dso. -Provides: lustre-osd-mount = %{version} +Provides: %{name}-osd-mount = %{version} Obsoletes: lustre-osd-mount < %{version} # Tests also require zpool from zfs package: Requires: zfs @@ -338,9 +340,11 @@ applications against the Lustre / LNet utilities libraries. %package tests Summary: Lustre testing framework Group: System Environment/Kernel -Provides: lustre-tests = %{version} +Provides: %{name}-tests = %{version} %if %{with lustre_iokit} -Requires: lustre-iokit +Requires: %{name} = %{version}, lustre-iokit +%else +Requires: %{name} = %{version} %endif Requires: lustre-devel = %{version} %if %{with lustre_modules} diff --git a/rpm/kmp-lustre-osd-ldiskfs.preamble b/rpm/kmp-lustre-osd-ldiskfs.preamble index e23d0dc..e54b383 100644 --- a/rpm/kmp-lustre-osd-ldiskfs.preamble +++ b/rpm/kmp-lustre-osd-ldiskfs.preamble @@ -2,5 +2,8 @@ Requires: %{requires_kmod_name} = %{requires_kmod_version} Requires: ldiskfsprogs >= 1.44.3.wc1 Requires: lustre-osd-ldiskfs-mount = %{version} Provides: lustre-osd = %{version} +Provides: %{name}-osd = %{version} +Obsoletes: %{name}-ldiskfs < %{version} +Obsoletes: %{name}-osd-ldiskfs < %{version} Obsoletes: lustre-ldiskfs < %{version} Obsoletes: lustre-osd-ldiskfs < %{version} -- 1.8.3.1