From 0ec5996ec0af15d4b4a626d6bbf7ce00f96739b6b33dcf5c961dae4e13644cea Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Fri, 27 Sep 2019 07:18:23 +0000 Subject: [PATCH] Accepting request 733591 from home:NMoreyChaisemartin:branches:science:HPC - Update to rdma-core v25.1 - No release notes available - Add rdma-core-rpmlintrc to hide non applicable rpmlint warnings OBS-URL: https://build.opensuse.org/request/show/733591 OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=108 --- _service | 2 +- baselibs.conf | 3 +- post_download.sh | 3 +- prebuilt-pandoc.tgz | 4 +- rdma-core-23.1.0.352dd809dde8.tar.gz | 3 - rdma-core-25.1.0.1841d48eec9d.tar.gz | 3 + rdma-core-rpmlintrc | 11 ++ rdma-core.changes | 7 ++ rdma-core.spec | 153 ++++++++++++++++++++++++++- 9 files changed, 176 insertions(+), 13 deletions(-) delete mode 100644 rdma-core-23.1.0.352dd809dde8.tar.gz create mode 100644 rdma-core-25.1.0.1841d48eec9d.tar.gz create mode 100644 rdma-core-rpmlintrc diff --git a/_service b/_service index 823b9e6..2e7b885 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - 352dd809dde8648949bb8ead9357dfe03bb8664e + 1841d48eec9d845daef961ac21795e5493a376ff suse/rdma-core.spec diff --git a/baselibs.conf b/baselibs.conf index 28b5585..d40e076 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,6 +3,7 @@ libibverbs1 libmlx4-1 libmlx5-1 libibumad3 +libibmad5 librdmacm1 rdma-core-devel -rsocket \ No newline at end of file +rsocket diff --git a/post_download.sh b/post_download.sh index 6dcb4cf..b4181ee 100644 --- a/post_download.sh +++ b/post_download.sh @@ -22,8 +22,9 @@ make docs tar czf ../../prebuilt-pandoc.tgz pandoc-prebuilt cd ../.. -EXTRA_SOURCES="Source2: post_download.sh\nSource3: prebuilt-pandoc.tgz" +EXTRA_SOURCES="Source2: post_download.sh\nSource3: prebuilt-pandoc.tgz\nSource4: rdma-core-rpmlintrc" PANDOC_SETUP="#Extract prebuilt pandoc file in the buildlib directory\n(cd buildlib && tar xf %{S:3})" sed -i -e '/Source1:/a '"$EXTRA_SOURCES" rdma-core.spec sed -i -e '/^BuildRequires: pandoc/d' rdma-core.spec +sed -i -e '/^BuildRequires: python3-docutils/d' rdma-core.spec sed -i -e '/^%setup /a '"$PANDOC_SETUP" rdma-core.spec diff --git a/prebuilt-pandoc.tgz b/prebuilt-pandoc.tgz index cce14c2..2337d83 100644 --- a/prebuilt-pandoc.tgz +++ b/prebuilt-pandoc.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b331609141df0c8afb4749d6ecffcf267b2fd97dd7847640ad36bea6eafc4c7c -size 27413 +oid sha256:c7bec6e3975d016a8b250995385ff165f20842fe134e2f755a029a409ddb7542 +size 63816 diff --git a/rdma-core-23.1.0.352dd809dde8.tar.gz b/rdma-core-23.1.0.352dd809dde8.tar.gz deleted file mode 100644 index 671e8c9..0000000 --- a/rdma-core-23.1.0.352dd809dde8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c16c36a08310c2e9d257f6ba132ab7d771dd504f0320b558da935b856d93177 -size 1198503 diff --git a/rdma-core-25.1.0.1841d48eec9d.tar.gz b/rdma-core-25.1.0.1841d48eec9d.tar.gz new file mode 100644 index 0000000..d773f73 --- /dev/null +++ b/rdma-core-25.1.0.1841d48eec9d.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba769a548d940d5cc5e1f2175e1ffb8718a2436da820d89821dc98d5339edb88 +size 1648748 diff --git a/rdma-core-rpmlintrc b/rdma-core-rpmlintrc new file mode 100644 index 0000000..db103b9 --- /dev/null +++ b/rdma-core-rpmlintrc @@ -0,0 +1,11 @@ +# This line is mandatory to access the configuration functions +from Config import * + +addFilter("libibverbs.* devel-file-in-non-devel-package") +addFilter("libibverbs.* obsolete-not-provided") +addFilter("libibmad.* shared-lib-calls-exit") +addFilter("libibverbs-utils.* shlib-policy-missing-lib") +addFilter("libibverbs.* shlib-policy-missing-lib") +addFilter("librdmacm-utils.* shlib-policy-missing-lib") +addFilter("libibverbs1.* shlib-fixed-dependency") +addFilter("librdmacm1.* shlib-fixed-dependency") diff --git a/rdma-core.changes b/rdma-core.changes index 9cf4c28..cf089e2 100644 --- a/rdma-core.changes +++ b/rdma-core.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 6 07:18:24 UTC 2019 - Nicolas Morey-Chaisemartin + +- Update to rdma-core v25.1 + - No release notes available +- Add rdma-core-rpmlintrc to hide non applicable rpmlint warnings + ------------------------------------------------------------------- Mon May 13 08:20:59 UTC 2019 - Nicolas Morey-Chaisemartin diff --git a/rdma-core.spec b/rdma-core.spec index d175fed..f2de778 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -21,20 +21,24 @@ %define with_static 0 %define with_pyverbs 1 -%define git_ver .0.352dd809dde8 +%define git_ver .0.1841d48eec9d Name: rdma-core -Version: 23.1 +Version: 25.1 Release: 0 Summary: RDMA core userspace libraries and daemons License: GPL-2.0-only OR BSD-2-Clause Group: Productivity/Networking/Other +%define efa_so_major 1 %define verbs_so_major 1 %define rdmacm_so_major 1 %define umad_so_major 3 %define mlx4_so_major 1 %define mlx5_so_major 1 +%define ibnetdisc_major 5 +%define mad_major 5 +%define efa_lname libefa%{efa_so_major} %define verbs_lname libibverbs%{verbs_so_major} %define rdmacm_lname librdmacm%{rdmacm_so_major} %define umad_lname libibumad%{umad_so_major} @@ -54,6 +58,7 @@ Source: rdma-core-%{version}%{git_ver}.tar.gz Source1: baselibs.conf Source2: post_download.sh Source3: prebuilt-pandoc.tgz +Source4: rdma-core-rpmlintrc BuildRequires: binutils BuildRequires: cmake >= 2.8.11 BuildRequires: gcc @@ -136,6 +141,7 @@ Requires: %{rdmacm_lname} = %{version}-%{release} Requires: %{umad_lname} = %{version}-%{release} Requires: %{verbs_lname} = %{version}-%{release} %if 0%{?dma_coherent} +Requires: %{efa_lname} = %{version}-%{release} Requires: %{mlx4_lname} = %{version}-%{release} Requires: %{mlx5_lname} = %{version}-%{release} %endif @@ -160,6 +166,12 @@ BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-route-3.0) %endif +Requires: infiniband-diags = %{version}-%{release} +Provides: infiniband-diags-devel = %{version}-%{release} +Obsoletes: infiniband-diags-devel < %{version}-%{release} +Provides: libibmad-devel = %{version}-%{release} +Obsoletes: libibmad-devel < %{version} + %description devel RDMA core development libraries and headers. @@ -169,6 +181,7 @@ Group: System/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: libcxgb3-rdmav2 < %{version}-%{release} Obsoletes: libcxgb4-rdmav2 < %{version}-%{release} +Obsoletes: libefa-rdmav2 < %{version}-%{release} Obsoletes: libhfi1verbs-rdmav2 < %{version}-%{release} Obsoletes: libi40iw-rdmav2 < %{version}-%{release} Obsoletes: libipathverbs-rdmav2 < %{version}-%{release} @@ -179,6 +192,7 @@ Obsoletes: libnes-rdmav2 < %{version}-%{release} Obsoletes: libocrdma-rdmav2 < %{version}-%{release} Obsoletes: librxe-rdmav2 < %{version}-%{release} %if 0%{?dma_coherent} +Requires: %{efa_lname} = %{version}-%{release} Requires: %{mlx4_lname} = %{version}-%{release} Requires: %{mlx5_lname} = %{version}-%{release} %endif @@ -197,6 +211,7 @@ Device-specific plug-in ibverbs userspace drivers are included: - libcxgb3: Chelsio T3 iWARP HCA - libcxgb4: Chelsio T4 iWARP HCA +- libefa: Amazon Elastic Fabric Adapter - libhfi1: Intel Omni-Path HFI - libhns: HiSilicon Hip06 SoC - libi40iw: Intel Ethernet Connection X722 RDMA @@ -208,6 +223,7 @@ Device-specific plug-in ibverbs userspace drivers are included: - libocrdma: Emulex OneConnect RDMA/RoCE Device - libqedr: QLogic QL4xxx RoCE HCA - librxe: A software implementation of the RoCE protocol +- libsiw: A software implementation of the iWarp protocol - libvmw_pvrdma: VMware paravirtual RDMA device %package -n %verbs_lname @@ -218,6 +234,13 @@ Requires: libibverbs = %{version} %description -n %verbs_lname This package contains the ibverbs runtime library. +%package -n %efa_lname +Summary: EFA runtime library +Group: System/Libraries + +%description -n %efa_lname +This package contains the efa runtime library. + %package -n %mlx4_lname Summary: MLX4 runtime library Group: System/Libraries @@ -232,6 +255,14 @@ Group: System/Libraries %description -n %mlx5_lname This package contains the mlx5 runtime library. +%package -n libibnetdisc%{ibnetdisc_major} +Summary: Infiniband Net Discovery runtime library +Group: System/Libraries + +%description -n libibnetdisc%{ibnetdisc_major} +This package contains the Infiniband Net Discovery runtime library needed +mainly by infiniband-diags. + %package -n libibverbs-utils Summary: Examples for the libibverbs library Group: Productivity/Networking/Other @@ -259,6 +290,24 @@ user applications need not know about this daemon as long as their app uses librdmacm to handle connection bring up/tear down. The librdmacm library knows how to talk directly to the ibacm daemon to retrieve data. +%package -n infiniband-diags +Summary: InfiniBand Diagnostic Tools +Group: Productivity/Networking/Diagnostic +Requires: perl = %{perl_version} + +%description -n infiniband-diags +diags provides IB diagnostic programs and scripts needed to diagnose an +IB subnet. + +%package -n libibmad%{mad_major} +Summary: Libibmad runtime library +Group: System/Libraries + +%description -n libibmad%{mad_major} +Libibmad provides low layer IB functions for use by the IB diagnostic +and management programs. These include MAD, SA, SMP, and other basic IB +functions. This package contains the runtime library. + %package -n iwpmd Summary: Userspace iWarp Port Mapper daemon Group: Development/Libraries/C and C++ @@ -374,6 +423,7 @@ easy, object-oriented access to IB verbs. -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \ -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \ + -DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \ %if %{with_static} -DENABLE_STATIC=1 \ %endif @@ -395,7 +445,7 @@ cd build cd .. mkdir -p %{buildroot}/%{_sysconfdir}/rdma -%global dracutlibdir %%{_sysconfdir}/dracut.conf.d +%global dracutlibdir %%{_libexecdir}/dracut/ %global sysmodprobedir %%{_sysconfdir}/modprobe.d mkdir -p %{buildroot}%{_udevrulesdir} @@ -416,8 +466,7 @@ chmod 0644 %{buildroot}%{sysmodprobedir}/50-libmlx4.conf install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh # Dracut file for IB support during boot -sed 's%/usr/libexec%/usr/lib%g' redhat/rdma.modules-setup.sh > %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh -chmod 0755 %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh +install -D -m0644 suse/module-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh # ibacm cd build @@ -433,6 +482,9 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %post -n %verbs_lname -p /sbin/ldconfig %postun -n %verbs_lname -p /sbin/ldconfig +%post -n %efa_lname -p /sbin/ldconfig +%postun -n %efa_lname -p /sbin/ldconfig + %post -n %mlx4_lname -p /sbin/ldconfig %postun -n %mlx4_lname -p /sbin/ldconfig @@ -445,6 +497,12 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %post -n %rdmacm_lname -p /sbin/ldconfig %postun -n %rdmacm_lname -p /sbin/ldconfig +%post -n libibnetdisc%{ibnetdisc_major} -p /sbin/ldconfig +%postun -n libibnetdisc%{ibnetdisc_major} -p /sbin/ldconfig + +%post -n libibmad%{mad_major} -p /sbin/ldconfig +%postun -n libibmad%{mad_major} -p /sbin/ldconfig + %post # we ship udev rules, so trigger an update. /sbin/udevadm trigger --subsystem-match=infiniband --action=change || true @@ -542,6 +600,8 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %dir %{dracutlibdir}/modules.d %dir %{dracutlibdir}/modules.d/05rdma %{dracutlibdir}/modules.d/05rdma/module-setup.sh +%{_udevrulesdir}/../rdma_rename +%{_udevrulesdir}/60-rdma-persistent-naming.rules %{_udevrulesdir}/75-rdma-description.rules %{_udevrulesdir}/90-rdma-hw-modules.rules %{_udevrulesdir}/90-rdma-ulp-modules.rules @@ -566,14 +626,17 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %endif %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/ibnd_* %{_mandir}/man3/ibv_* %{_mandir}/man3/rdma* %{_mandir}/man3/umad* %{_mandir}/man3/*_to_ibv_rate.* %{_mandir}/man7/rdma_cm.* %if 0%{?dma_coherent} +%{_mandir}/man3/efadv* %{_mandir}/man3/mlx5dv* %{_mandir}/man3/mlx4dv* +%{_mandir}/man7/efadv* %{_mandir}/man7/mlx5dv* %{_mandir}/man7/mlx4dv* %endif @@ -591,11 +654,23 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %{_mandir}/man7/rxe* %{_mandir}/man8/rxe* +%files -n libibnetdisc%{ibnetdisc_major} +%defattr(-, root, root) +%{_libdir}/libibnetdisc.so.* + +%files -n libibmad%{mad_major} +%defattr(-, root, root) +%{_libdir}/libibmad.so.* + %files -n %verbs_lname %defattr(-,root,root) %{_libdir}/libibverbs*.so.* %if 0%{?dma_coherent} +%files -n %efa_lname +%defattr(-,root,root) +%{_libdir}/libefa*.so.* + %files -n %mlx4_lname %defattr(-,root,root) %{_libdir}/libmlx4*.so.* @@ -626,6 +701,74 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh %{_sbindir}/rcibacm %doc %{_docdir}/%{name}-%{version}/ibacm.md +%files -n infiniband-diags +%defattr(-, root, root) +%config %{_sysconfdir}/infiniband-diags/error_thresholds +%dir %{_sysconfdir}/infiniband-diags +%config(noreplace) %{_sysconfdir}/infiniband-diags/* +%{_sbindir}/ibaddr +%{_mandir}/man8/ibaddr* +%{_sbindir}/ibnetdiscover +%{_mandir}/man8/ibnetdiscover* +%{_sbindir}/ibping +%{_mandir}/man8/ibping* +%{_sbindir}/ibportstate +%{_mandir}/man8/ibportstate* +%{_sbindir}/ibroute +%{_mandir}/man8/ibroute.* +%{_sbindir}/ibstat +%{_mandir}/man8/ibstat.* +%{_sbindir}/ibsysstat +%{_mandir}/man8/ibsysstat* +%{_sbindir}/ibtracert +%{_mandir}/man8/ibtracert* +%{_sbindir}/perfquery +%{_mandir}/man8/perfquery* +%{_sbindir}/sminfo +%{_mandir}/man8/sminfo* +%{_sbindir}/smpdump +%{_mandir}/man8/smpdump* +%{_sbindir}/smpquery +%{_mandir}/man8/smpquery* +%{_sbindir}/saquery +%{_mandir}/man8/saquery* +%{_sbindir}/vendstat +%{_mandir}/man8/vendstat* +%{_sbindir}/iblinkinfo +%{_mandir}/man8/iblinkinfo* +%{_sbindir}/ibqueryerrors +%{_mandir}/man8/ibqueryerrors* +%{_sbindir}/ibcacheedit +%{_mandir}/man8/ibcacheedit* +%{_sbindir}/ibccquery +%{_mandir}/man8/ibccquery* +%{_sbindir}/ibccconfig +%{_mandir}/man8/ibccconfig* +%{_sbindir}/dump_fts +%{_mandir}/man8/dump_fts* +%{_sbindir}/ibhosts +%{_mandir}/man8/ibhosts* +%{_sbindir}/ibswitches +%{_mandir}/man8/ibswitches* +%{_sbindir}/ibnodes +%{_mandir}/man8/ibnodes* +%{_sbindir}/ibrouters +%{_mandir}/man8/ibrouters* +%{_sbindir}/ibfindnodesusing.pl +%{_mandir}/man8/ibfindnodesusing* +%{_sbindir}/ibidsverify.pl +%{_mandir}/man8/ibidsverify* +%{_sbindir}/check_lft_balance.pl +%{_mandir}/man8/check_lft_balance* +%{_sbindir}/dump_lfts.sh +%{_mandir}/man8/dump_lfts* +%{_sbindir}/dump_mfts.sh +%{_mandir}/man8/dump_mfts* +%{_sbindir}/ibstatus +%{_mandir}/man8/ibstatus* +%{_mandir}/man8/infiniband-diags* +%{perl_vendorlib}/IBswcountlimits.pm + %files -n iwpmd %defattr(-,root,root) %dir %{_sysconfdir}/rdma