From 5cb11221cffb116a5f3865281965e410ef0df375 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: May 11 2020 16:50:01 +0000 Subject: build on armhfp --- diff --git a/SPECS/rdma-core.spec b/SPECS/rdma-core.spec index 88eb9ef..7331fc7 100644 --- a/SPECS/rdma-core.spec +++ b/SPECS/rdma-core.spec @@ -3,6 +3,10 @@ Version: 26.0 Release: 8%{?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 @@ -118,10 +122,12 @@ Provides: libcxgb4-static = %{version}-%{release} Obsoletes: libcxgb4-static < %{version}-%{release} Provides: libhfi1-static = %{version}-%{release} Obsoletes: libhfi1-static < %{version}-%{release} +%if 0%{?dma_coherent} Provides: libmlx4-static = %{version}-%{release} Obsoletes: libmlx4-static < %{version}-%{release} Provides: libmlx5-static = %{version}-%{release} Obsoletes: libmlx5-static < %{version}-%{release} +%endif Provides: libi40iw-devel-static = %{version}-%{release} Obsoletes: libi40iw-devel-static < %{version}-%{release} @@ -151,12 +157,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} Provides: libusnic_verbs = %{version}-%{release} @@ -327,14 +335,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}/ @@ -413,9 +427,11 @@ find %{buildroot} -name '*efa*' -exec rm -fv {} \; %doc %{_docdir}/%{name}-%{version}/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 @@ -424,10 +440,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 @@ -450,11 +470,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_* @@ -509,20 +531,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}-%{version}/libibverbs.md %doc %{_docdir}/%{name}-%{version}/rxe.md %doc %{_docdir}/%{name}-%{version}/tag_matching.md %{_bindir}/rxe_cfg %{_mandir}/man7/rxe* +%if 0%{?dma_coherent} %ifnarch s390 %{_mandir}/man7/mlx4dv* %{_mandir}/man7/mlx5dv* %endif +%endif %{_mandir}/man8/rxe* %files -n libibverbs-utils