diff --git a/debian/changelog b/debian/changelog index 80dc9c68e92..80223788a1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +daos (2.7.100-8) unstable; urgency=medium + [ Cedric Koch-Hofer] + * Update BR: argobots to 1.2 + + -- Cedric Koch-Hofer Mon, 07 Oct 2024 11:06:00 -0700 + daos (2.7.100-7) unstable; urgency=medium [ Tomasz Gromadzki ] * Add support of the PMDK package 2.1.0 with NDCTL enabled. diff --git a/debian/control b/debian/control index 328bda36426..a8237643fae 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 10), pkg-config, python3-dev, python3-distro, - libabt-dev, + libabt-dev (>= 1.2), libucx-dev, libpmemobj-dev (>= 2.1.0), libfuse3-dev, diff --git a/utils/build.config b/utils/build.config index 52749b3f1ce..5b039750a9b 100644 --- a/utils/build.config +++ b/utils/build.config @@ -2,7 +2,7 @@ component=daos [commit_versions] -argobots=v1.1 +argobots=v1.2 fuse=fuse-3.16.2 pmdk=2.1.0 isal=v2.30.0 @@ -31,3 +31,4 @@ ofi=https://github.com/ofiwg/libfabric/commit/d827c6484cc5bf67dfbe395890e258860c fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff mercury=https://raw.githubusercontent.com/daos-stack/mercury/f3dc286fb40ec1a3a38a2e17c45497bc2aa6290d/na_ucx.patch 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 ce261853ffc..76aee4cc7ca 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -5,6 +5,7 @@ %global mercury_version 2.4 %global libfabric_version 1.15.1-1 +%global argobots_version 1.2 %global __python %{__python3} %if (0%{?rhel} >= 8) @@ -15,7 +16,7 @@ Name: daos Version: 2.7.100 -Release: 7%{?relval}%{?dist} +Release: 8%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -41,11 +42,11 @@ BuildRequires: hwloc-devel BuildRequires: bullseye %endif %if (0%{?rhel} >= 8) -BuildRequires: argobots-devel >= 1.1 +BuildRequires: argobots-devel >= %{argobots_version} BuildRequires: json-c-devel BuildRequires: boost-python3-devel %else -BuildRequires: libabt-devel >= 1.0rc1 +BuildRequires: libabt-devel >= %{argobots_version} BuildRequires: libjson-c-devel BuildRequires: boost-devel %endif @@ -599,6 +600,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog +* Mon Oct 07 2024 Cedric Koch-Hofer 2.7.100-8 +- Update BR: argobots to 1.2 + * Tue Oct 01 2024 Tomasz Gromadzki 2.7.100-7 - Add support of the PMDK package 2.1.0 with NDCTL enabled. * Increase the default ULT stack size to 20KiB if the engine uses