From 35964bad0f5cee04a72e77d222828ce4f570c094 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Nov 23 2020 19:13:17 +0000 Subject: build on armhfp --- diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec index 6e40250..772f065 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -3,6 +3,10 @@ Version: 29.0 Release: 3%{?dist} Summary: RDMA core userspace libraries and daemons +%ifnarch %{arm} +%define dma_coherent 1 +%endif + # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license # providers/ipathverbs/ Dual licensed using a BSD license with an extra patent clause # providers/rxe/ Incorporates code from ipathverbs and contains the patent clause @@ -128,12 +132,14 @@ Provides: libhfi1 = %{version}-%{release} Obsoletes: libhfi1 < %{version}-%{release} Provides: libi40iw = %{version}-%{release} Obsoletes: libi40iw < %{version}-%{release} +%if 0%{?dma_coherent} Provides: libmlx4 = %{version}-%{release} Obsoletes: libmlx4 < %{version}-%{release} %ifnarch s390 Provides: libmlx5 = %{version}-%{release} Obsoletes: libmlx5 < %{version}-%{release} %endif +%endif Provides: librxe = %{version}-%{release} Obsoletes: librxe < %{version}-%{release} @@ -296,14 +302,20 @@ mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma mkdir -p %{buildroot}%{sysmodprobedir} install -D -m0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf install -D -m0644 redhat/rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs +%if 0%{?dma_coherent} install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf +%endif install -D -m0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service install -D -m0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules +%if 0%{?dma_coherent} install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf +%endif install -D -m0755 redhat/rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel install -D -m0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf +%if 0%{?dma_coherent} install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh +%endif # ibdev2netdev helper script install -D -m0755 %{SOURCE1} %{buildroot}%{_bindir}/ @@ -385,9 +397,11 @@ find %{buildroot} -name '*efa*' -exec rm -fv {} \; %doc %{_docdir}/%{name}/udev.md %config(noreplace) %{_sysconfdir}/rdma/* %config(noreplace) %{_sysconfdir}/udev/rules.d/* +%if 0%{?dma_coherent} %ifnarch s390 %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf %endif +%endif %config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf %{_unitdir}/rdma-hw.target %{_unitdir}/rdma-load-modules@.service @@ -396,10 +410,14 @@ find %{buildroot} -name '*efa*' -exec rm -fv {} \; %{dracutlibdir}/modules.d/05rdma/module-setup.sh %{_udevrulesdir}/../rdma_rename %{_udevrulesdir}/* +%if 0%{?dma_coherent} %{sysmodprobedir}/libmlx4.conf +%endif %{_libexecdir}/rdma-init-kernel %{_libexecdir}/rdma-set-sriov-vf +%if 0%{?dma_coherent} %{_libexecdir}/mlx4-setup.sh +%endif %{_libexecdir}/truescale-serdes.cmds %{_sbindir}/rdma-ndd %{_bindir}/ibdev2netdev @@ -422,11 +440,13 @@ find %{buildroot} -name '*efa*' -exec rm -fv {} \; %{_mandir}/man3/rdma* %{_mandir}/man3/umad* %{_mandir}/man3/*_to_ibv_rate.* +if 0%{?dma_coherent} %ifnarch s390 %{_mandir}/man3/mlx4dv* %{_mandir}/man3/mlx5dv* %{_mandir}/man7/mlx5dv* %endif +%endif %{_mandir}/man7/rdma_cm.* %{_mandir}/man3/ibnd_* @@ -481,19 +501,24 @@ find %{buildroot} -name '*efa*' -exec rm -fv {} \; %dir %{_libdir}/libibverbs %{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs/*.so +%if 0%{?dma_coherent} %ifnarch s390 %{_libdir}/libmlx4.so.* %{_libdir}/libmlx5.so.* %endif +%endif %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver %doc %{_docdir}/%{name}/libibverbs.md %doc %{_docdir}/%{name}/rxe.md %doc %{_docdir}/%{name}/tag_matching.md %{_mandir}/man7/rxe* +%if 0%{?dma_coherent} %ifnarch s390 %{_mandir}/man7/mlx4dv* %{_mandir}/man7/mlx5dv* %endif +%endif +%{_mandir}/man8/rxe* %files -n libibverbs-utils %{_bindir}/ibv_*