DAOS-15997 build: bump mercury version to 2.4.0rc4 (#14873)

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>
daos-stack · Aug 6, 2024 · d736de1 · d736de1
1 parent 61cf766
commit d736de1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+daos (2.7.100-4) unstable; urgency=medium
+  [ Jerome Soumagne ]
+  * Bump mercury version to 2.4.0rc4
+
+ -- Jerome Soumagne <jerome.soumagne@intel.com>  Mon, 05 Aug 2024 12:00:00 -0500
+
 daos (2.7.100-3) unstable; urgency=medium
   [ Dalton Bohning ]
   * Add pciutils-devel build dep for client-tests package

diff --git a/debian/control b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 10),
                libopenmpi-dev,
                libssl-dev,
                libyaml-dev,
-               libmercury-dev (>= 2.3.1-1),
+               libmercury-dev (>= 2.4),
                scons,
                uuid-dev,
                pkg-config,

diff --git a/utils/build.config b/utils/build.config
@@ -9,12 +9,11 @@ ISAL = v2.30.0
 ISAL_CRYPTO = v2.23.0
 SPDK = v22.01.2
 OFI = v1.19.1
-MERCURY = v2.3.1
+MERCURY = v2.4.0rc4
 PROTOBUFC = v1.3.3
 UCX=v1.14.1
 
 [patch_versions]
 spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc75664978.diff,https://github.com/spdk/spdk/commit/445a4c808badbad3942696ecf16fa60e8129a747.diff
 ofi=https://github.com/ofiwg/libfabric/commit/d827c6484cc5bf67dfbe395890e258860c3f0979.diff
-mercury=https://raw.githubusercontent.com/daos-stack/mercury/857f1d5d2ca72d4c1b8d7be5e7fd26d6292b495f/na_ucx_am_send_retry.patch,https://github.com/mercury-hpc/mercury/commit/b8c26fd86281f3b0883c31bd2d0cb467a12b860d.diff,https://github.com/mercury-hpc/mercury/commit/a35589c3d1134d9c80640e78247e210162ac4a3c.diff,https://github.com/mercury-hpc/mercury/commit/fa4abbb6273d975b2ef17ac4e561fd4255d384db.diff
 fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff
diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec
@@ -3,7 +3,7 @@
 %define agent_svc_name daos_agent.service
 %define sysctl_script_name 10-daos_server.conf
 
-%global mercury_version 2.3.1-1%{?dist}
+%global mercury_version   2.4
 %global libfabric_version 1.15.1-1
 %global __python %{__python3}
 
@@ -15,7 +15,7 @@
 
 Name:          daos
 Version:       2.7.100
-Release:       3%{?relval}%{?dist}
+Release:       4%{?relval}%{?dist}
 Summary:       DAOS Storage Engine
 
 License:       BSD-2-Clause-Patent
@@ -591,6 +591,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent
 # No files in a shim package
 
 %changelog
+* Mon Aug 05 2024 Jerome Soumagne <jerome.soumagne@intel.com> 2.7.100-4
+- Bump mercury version to 2.4.0rc4
+
 * Thu Jul 11 2024 Dalton Bohning <dalton.bohning@intel.com> 2.7.100-3
 - Add pciutils-devel build dep for client-tests package