Skip to content

Commit

Permalink
DAOS-15596 pkg: Update argobots to 1.2 (#15181)
Browse files Browse the repository at this point in the history
Update argobots dependency to 1.2 release

Signed-off-by: Cedric Koch-Hofer <[email protected]>
  • Loading branch information
knard-intel authored Oct 15, 2024
1 parent f42e4c5 commit e2d0df9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.7.100-8) unstable; urgency=medium
[ Cedric Koch-Hofer]
* Update BR: argobots to 1.2

-- Cedric Koch-Hofer <[email protected]> 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.
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion utils/build.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
10 changes: 7 additions & 3 deletions utils/rpms/daos.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 <[email protected]> 2.7.100-8
- Update BR: argobots to 1.2

* Tue Oct 01 2024 Tomasz Gromadzki <[email protected]> 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
Expand Down

0 comments on commit e2d0df9

Please sign in to comment.