Skip to content

DAOS-18596 common: use libpmemobj1-devel on Leap #17565

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

Closed
grom72 wants to merge 1 commit into from
+8 −4
Closed

DAOS-18596 common: use libpmemobj1-devel on Leap #17565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ci/provisioning/post_provision_config_common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ post_provision_config_nodes() {
rm -f "$REPOS_DIR"/*_job_daos-stack_job_*_job_*.repo
time dnf -y erase fio fuse ior-hpc mpich-autoload \
argobots cart daos daos-client daos-spdk dpdk \
libisa-l libpmemobj mercury mpich \
libisa-l libpmemobj libpmemobj1 mercury mpich \
pmix protobuf-c spdk libfabric libpmem \
munge-libs munge slurm \
slurm-example-configs slurmctld slurm-slurmmd
Expand Down
10 changes: 7 additions & 3 deletions utils/rpms/daos.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ BuildRequires: libjson-c-devel
BuildRequires: boost-devel
%endif
%if %{with server}
BuildRequires: libpmemobj-devel >= 2.1.0
%if (0%{?suse_version} >= 1500)
BuildRequires: libpmemobj1-devel >= 2.1.2-1
%else
BuildRequires: libpmemobj-devel >= 2.1.2-1
%endif
%endif
BuildRequires: fused-devel
%if (0%{?suse_version} >= 1500)
Expand Down Expand Up @@ -164,10 +168,10 @@ Requires: ndctl
# needed to set PMem configuration goals in BIOS through control-plane
%if (0%{?suse_version} >= 1500)
Requires: ipmctl >= 03.00.00.0423
Requires: libpmemobj1 >= 2.1.0-1.suse1500
Requires: libpmemobj1 >= 2.1.2-1
%else
Requires: ipmctl >= 03.00.00.0468
Requires: libpmemobj >= 2.1.0-1%{?dist}
Requires: libpmemobj >= 2.1.2-1
%endif
Requires: mercury >= %{mercury_version}
Requires(post): /sbin/ldconfig
Expand Down
Loading