From 4e5f925c6cdbcc8fcaa5f87d6689e75ee9ef8cc8 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Wed, 11 Feb 2026 14:32:40 +0100 Subject: [PATCH 1/2] DAOS-18296 common: pin PMDK version number Pin PMDK to version 2.1.2-1 to allow upgrade master/2.8 to version 2.1.3 Skip-func-test-leap15: false Signed-off-by: Tomasz Gromadzki --- utils/build.config | 5 ++--- utils/rpms/daos.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/utils/build.config b/utils/build.config index ab70e14dcb4..3503fa1fb3a 100644 --- a/utils/build.config +++ b/utils/build.config @@ -4,7 +4,7 @@ component=daos [commit_versions] argobots=v1.2 fuse=fuse-3.16.2 -pmdk=2.1.0 +pmdk=2.1.2 isal=v2.30.0 isal_crypto=v2.24.0 spdk=v22.01.2 @@ -16,7 +16,7 @@ ucx=v1.14.1 [repos] argobots=https://github.com/pmodels/argobots.git fuse=https://github.com/libfuse/libfuse.git -pmdk=https://github.com/pmem/pmdk.git +pmdk=https://github.com/daos-stack/pmdk.git isal=https://github.com/intel/isa-l.git isal_crypto=https://github.com/intel/isa-l_crypto.git spdk=https://github.com/spdk/spdk.git @@ -29,5 +29,4 @@ ucx=https://github.com/openucx/ucx.git spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff mercury=https://github.com/mercury-hpc/mercury/commit/0a7756d4ef2f329fa7caa8e4052a099a91816f2f.diff,https://github.com/mercury-hpc/mercury/commit/e9eff75beee31bce6e8d6ea6841652f453a26d71.diff,https://github.com/mercury-hpc/mercury/commit/be5f9eb8415e46cfe9e12dcf5b82db67fccb34d2.diff,https://github.com/mercury-hpc/mercury/commit/2b6ce8622706195a6d432b77ba9c5b7b013bea76.diff,https://github.com/mercury-hpc/mercury/commit/f62eeb5273f8cd47b9a0ca2e0bfd7c0e9518f0b8.diff -pmdk=https://github.com/pmem/pmdk/commit/2abe15ac0b4eed894b6768cd82a3b0a7c4336284.diff argobots=https://github.com/pmodels/argobots/pull/397/commits/411e5b344642ebc82190fd8b125db512e5b449d1.diff,https://github.com/pmodels/argobots/commit/bb0c908abfac4bfe37852eee621930634183c6aa.diff diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index c8bfd14f46a..27a1a886655 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -23,7 +23,7 @@ Name: daos Version: 2.6.4 -Release: 16%{?relval}%{?dist} +Release: 17%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -58,7 +58,7 @@ BuildRequires: libjson-c-devel BuildRequires: boost-devel %endif %if %{with server} -BuildRequires: libpmemobj-devel >= 2.1.0 +BuildRequires: libpmemobj-devel >= 2.1.2-1 %endif %if (0%{?rhel} >= 8) BuildRequires: fuse3-devel >= 3 @@ -156,11 +156,11 @@ Requires: ndctl # needed to set PMem configuration goals in BIOS through control-plane %if (0%{?suse_version} >= 1500) Requires: ipmctl >= 03.00.00.0423 -Requires: libpmemobj1 >= 2.1.0-3.suse1500 +Requires: libpmemobj1 = 2.1.2-1.suse1500 Requires: libfabric1 >= %{libfabric_version} %else Requires: ipmctl >= 03.00.00.0468 -Requires: libpmemobj >= 2.1.0-6%{?dist} +Requires: libpmemobj = 2.1.2-1%{?dist} %endif Requires: libfabric >= %{libfabric_version} Requires: mercury-libfabric >= %{mercury_version} @@ -635,6 +635,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog +* Wed Feb 11 2026 Tomasz Gromadzki 2.6.4-17 +- Pin PMDK (libpmemobj) version to 2.1.2-1 + * Thu Feb 05 2026 Jerome Soumagne 2.6.4-16 - Require mercury-libfabric to always install libfabric plugin - Bump mercury min version to 2.4.1 From 036b57ef0702a77999bd06b03fbc9a4e485cf534 Mon Sep 17 00:00:00 2001 From: Tomasz Gromadzki Date: Mon, 16 Feb 2026 10:02:53 +0100 Subject: [PATCH 2/2] Fix suse build dependency Signed-off-by: Tomasz Gromadzki Cancel-prev-build: false Allow-unstable-test: true Skip-func-test-leap15: false --- utils/rpms/daos.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index 27a1a886655..abb5cf443d5 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -58,8 +58,12 @@ BuildRequires: libjson-c-devel BuildRequires: boost-devel %endif %if %{with server} +%if (0%{?suse_version} >= 1500) +BuildRequires: libpmemobj1-devel >= 2.1.2-1 +%else BuildRequires: libpmemobj-devel >= 2.1.2-1 %endif +%endif %if (0%{?rhel} >= 8) BuildRequires: fuse3-devel >= 3 %else