Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-15596 pkg: Update argobots to 1.2 #15181

Merged
merged 8 commits into from
Oct 15, 2024
Merged

DAOS-15596 pkg: Update argobots to 1.2 #15181

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
861445b
DAOS-15596 pkg: Update argobots to 1.2
kanard38 Sep 24, 2024
bf6641a
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
kanard38 Oct 7, 2024
138a284
DAOS-15596 pkg: Update argobots to 1.2
kanard38 Sep 24, 2024
ac49076
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
kanard38 Oct 8, 2024
32d4aea
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
kanard38 Oct 9, 2024
446561a
DAOS-15596 pkg: Update argobots to 1.2
kanard38 Sep 24, 2024
7e3e54b
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
kanard38 Oct 10, 2024
8673384
Merge remote-tracking branch 'origin/master' into ckochhof/dev/master…
kanard38 Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
daos (2.7.100-7) 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-6) unstable; urgency=medium
[ Kris Jacque ]
* Bump minimum golang-go version to 1.21
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
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.0.0),
libfuse3-dev,
Expand Down
3 changes: 2 additions & 1 deletion utils/build.config
View file
Open in desktop
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.0.0
isal=v2.30.0
Expand Down Expand Up @@ -30,3 +30,4 @@ spdk=https://github.com/spdk/spdk/commit/b0aba3fcd5aceceea530a702922153bc7566497
ofi=https://github.com/ofiwg/libfabric/commit/d827c6484cc5bf67dfbe395890e258860c3f0979.diff
fuse=https://github.com/libfuse/libfuse/commit/c9905341ea34ff9acbc11b3c53ba8bcea35eeed8.diff
mercury=https://raw.githubusercontent.com/daos-stack/mercury/f3dc286fb40ec1a3a38a2e17c45497bc2aa6290d/na_ucx.patch
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
View file
Open in desktop
brianjmurrell marked this conversation as resolved.
Show resolved Hide resolved
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: 5%{?relval}%{?dist}
Release: 7%{?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 @@ -592,6 +593,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-7
- Update BR: argobots to 1.2

* Mon Sep 23 2024 Kris Jacque <[email protected]> 2.7.100-6
- Bump min supported go version to 1.21

Expand Down
Loading