Skip to content

DAOS-19127 build: patch isal_crypto #18470

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

Draft
daltonbohning wants to merge 2 commits into
base: master
Choose a base branch
from
+205 −1
Draft

DAOS-19127 build: patch isal_crypto #18470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6967a6e
DAOS-19127 build: patch isal_crypto
daltonbohning Jun 9, 2026
95ba9da
use deps/patches instead of https
daltonbohning Jun 10, 2026
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
1 change: 1 addition & 0 deletions utils/build.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ protobufc=https://github.com/protobuf-c/protobuf-c.git
ucx=https://github.com/openucx/ucx.git

[patch_versions]
isal_crypto=https://github.com/intel/isa-l_crypto/commit/de6b07c73b33de927b470d6ba860502a12e9fa5e.diff

@jolivier23 jolivier23 Jun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's up to you but for hermetic build, it is better to download the patch into deps/patches/isal_crypto as we've done with several others. Though I see some https links under pmdk so it has diverged already from where we were at one point.

@daltonbohning daltonbohning Jun 10, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do it that way then

spdk=0001_external_isal_v26.01.patch
mercury=0001_dep_versions.patch,0002_ofi_counters.patch,0003_ofi_auth_key.patch,0004_ucx_connection_reset.patch,0005_ucx_put_flush.patch
pmdk=https://github.com/daos-stack/pmdk/commit/bb048d67ccd07609f86a5e8b3c6ad54414d593ee.diff,https://github.com/daos-stack/pmdk/commit/69925cf455ef672c4cbdbdb13bef7ae581e67045.diff,https://github.com/daos-stack/pmdk/commit/6805ed4f8d1a4e4c6070bf8b68f0dffef08b9c99.diff
Expand Down
3 changes: 3 additions & 0 deletions utils/rpms/isa-l_crypto.changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Tue Jun 09 2026 Dalton Bohning <dalton.bohning@hpe.com> - 2.26.0-2
* Patch to support older NASM versions

* Fri May 08 2026 Tom Nabarro <thomas.nabarro@hpe.com> - 2.26.0-1
* Update DAOS to 2.26 release to mirror SPDK v26.01 submodule

Expand Down
2 changes: 1 addition & 1 deletion utils/rpms/package_info.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export isal_version="2.31.1"
export isal_release="8${distro_name}"
export isal_full="${isal_version}-${isal_release}"
export isal_crypto_version="2.26"
export isal_crypto_release="1${distro_name}"
export isal_crypto_release="2${distro_name}"
export isal_crypto_full="${isal_crypto_version}-${isal_crypto_release}"
export spdk_major_version="26.01"
export daos_spdk_version=${spdk_major_version}
Expand Down
Loading