From 9100560e8a40b2e291cfff3b3111285773b5c9e4 Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Wed, 29 May 2024 03:31:06 +0000 Subject: [PATCH] Fix CI build Fix build when installed the OS provided e2fsprogs pkg via upgrading/replacing current OS provided e2fsprogs to Lustre version e2fsprogs, a.k.a ldiskfsprogs. Signed-off-by: Xinliang Liu (cherry picked from commit f65376f44a4224452cbfcedf196734610a82b3c0) --- lustre.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lustre.spec b/lustre.spec index 70988be..b286947 100644 --- a/lustre.spec +++ b/lustre.spec @@ -186,7 +186,7 @@ Summary: Lustre File System Name: %{lustre_name} Version: 2.15.4 -Release: 1 +Release: 2 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 @@ -270,6 +270,7 @@ BuildRequires: pkgconfig BuildRequires: openEuler-rpm-config %if %{with ldiskfs} BuildRequires: kernel-debugsource +BuildRequires: ldiskfsprogs %endif %endif BuildRequires: pkg-config @@ -930,6 +931,9 @@ rm -rf $RPM_BUILD_ROOT rm -rf %{_tmppath}/kmp %changelog +* Wed May 29 2024 Xinliang Liu - 2.15.4-2 +- Fix build when installed the OS provided e2fsprogs pkg. + * Tue May 21 2024 Xinliang Liu - 2.15.4-1 - Fix ldiskfs build. - Update to 2.15.4. -- Gitee