rpms/rdma-core
6
0
Fork 0
Code Issues Pull Requests Releases Activity

rdma-core: revert ppc64le hack, handle libusnic_verbs

Browse Source 
- Revert work-around for ppc64le library issues
- Add Obsoletes/Provides for libusnic_verbs

Signed-off-by: Jarod Wilson <jarod@redhat.com>
This commit is contained in:
Jarod Wilson 2017-08-01 09:40:50 -04:00
parent 29dd510f84
commit c016866231
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rdma-core.spec
View File

@ -1,6 +1,6 @@
Name: rdma-core Name: rdma-core
Version: 14 Version: 14
Release: 2%{?dist} Release: 3%{?dist}
Summary: RDMA core userspace libraries and daemons Summary: RDMA core userspace libraries and daemons
# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@ -138,6 +138,8 @@ Provides: libocrdma = %{version}-%{release}
Obsoletes: libocrdma < %{version}-%{release} Obsoletes: libocrdma < %{version}-%{release}
Provides: librxe = %{version}-%{release} Provides: librxe = %{version}-%{release}
Obsoletes: librxe < %{version}-%{release} Obsoletes: librxe < %{version}-%{release}
Provides: libusnic_verbs = %{version}-%{release}
Obsoletes: libusnic_verbs < %{version}-%{release}
%description -n libibverbs %description -n libibverbs
libibverbs is a library that allows userspace processes to use RDMA libibverbs is a library that allows userspace processes to use RDMA
@ -315,13 +317,7 @@ install -D -m0644 redhat/rdma.fixup-mtrr.awk %{buildroot}%{_libexecdir}/rdma-fix
install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
# ibacm # ibacm
%ifnarch ppc64le
bin/ib_acme -D . -O bin/ib_acme -D . -O
%else
# hack alert: working around ib_acme failing on ppc64le
# bin/ib_acme: error while loading shared libraries: /builddir/build/BUILD/rdma-core-14/lib/libibverbs.so.1: expected localentry:0 `pthread_cond_init'
touch ibacm_opts.cfg
%endif
# multi-lib conflict resolution hacks (bug 1429362) # multi-lib conflict resolution hacks (bug 1429362)
sed -i -e 's|%{_libdir}|/usr/lib|' %{buildroot}%{_mandir}/man7/ibacm_prov.7 sed -i -e 's|%{_libdir}|/usr/lib|' %{buildroot}%{_mandir}/man7/ibacm_prov.7
sed -i -e 's|%{_libdir}|/usr/lib|' ibacm_opts.cfg sed -i -e 's|%{_libdir}|/usr/lib|' ibacm_opts.cfg
@ -508,6 +504,10 @@ rm -rf %{buildroot}/%{_initrddir}/
%doc %{_docdir}/%{name}-%{version}/ibsrpdm.md %doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
%changelog %changelog
* Tue Aug 01 2017 Jarod Wilson <jarod@redhat.com> - 14-3
- Revert work-around for ppc64le library issues
- Add Obsoletes/Provides for libusnic_verbs
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 14-2 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild