From 81d00f1f40bd0201506e13ff0ccf1a04545282b1 Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Fri, 12 May 2023 05:48:51 +0000 Subject: [PATCH] Fix EBS build dependency OBS will install all the "BuildRequires:" pkgs no matter if it is included by a %if condition whereas EBS will handle %if statement. Acording to the client rpm requires list[1], client build requires libmount-devel. [1] https://build.openeuler.openatom.cn/package/binary/openEuler:Epol/lustre/standard_aarch64/aarch64/lustre-client-2.15.54-2.oe1.aarch64.rpm Signed-off-by: Xinliang Liu --- lustre.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lustre.spec b/lustre.spec index 86ac76f..5b896ef 100644 --- a/lustre.spec +++ b/lustre.spec @@ -179,7 +179,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: 2.15.54 -Release: 2 +Release: 3 License: GPL-2.0-only AND LGPL-2.1-or-later Group: System Environment/Kernel Source: https://github.com/lustre/lustre-release/archive/refs/tags/%{version}.tar.gz @@ -264,6 +264,8 @@ Requires(postun): systemd BuildRequires: systemd %endif +BuildRequires: libmount-devel + %description Userspace tools and files for the Lustre file system. @@ -295,7 +297,7 @@ echo $TMPFILE %if %{with lustre_utils} %package osd-ldiskfs-mount Summary: osd-ldiskfs-mount contains mount's ldiskfs specific dso. -BuildRequires: e2fsprogs-devel >= 1.44.3 libmount-devel +BuildRequires: e2fsprogs-devel >= 1.44.3 Requires: ldiskfsprogs > 1.45.6 libmount Provides: lustre-osd-mount = %{version} Provides: %{name}-osd-mount = %{version} @@ -316,7 +318,6 @@ 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. -BuildRequires: libmount-devel Requires: libmount Provides: %{name}-osd-mount = %{version} Obsoletes: lustre-osd-mount < %{version} @@ -876,6 +877,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf %{_tmppath}/kmp %changelog +* Fri May 12 2023 Xinliang Liu - 2.15.54-3 +- Fix client build requires libmount-devel + * Thu Apr 20 2023 Xinliang Liu - 2.15.54-2 - Fix release number contains double %{dist}, e.g. *.oe1.oe1.aarch64.rpm - Fix sort by version number when finding the latest kernel version. -- Gitee