From ae01c213070b8a667f5baa8a4ad74e85e9fab22e Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Mon, 15 Jun 2020 21:33:49 -0400
Subject: [PATCH] Rebase to upstream release v30.0

Signed-off-by: Honggang Li <honli@redhat.com>
---
 .gitignore     |  1 +
 rdma-core.spec | 36 ++++++++++++++++++++----------------
 sources        |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc6b27b..335d6a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /rdma-core-27.0.tar.gz
 /rdma-core-28.0.tar.gz
 /rdma-core-29.0.tar.gz
+/rdma-core-30.0.tar.gz
diff --git a/rdma-core.spec b/rdma-core.spec
index a92a220..3b0af85 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -1,6 +1,6 @@
 Name: rdma-core
-Version: 29.0
-Release: 2%{?dist}
+Version: 30.0
+Release: 1%{?dist}
 Summary: RDMA core userspace libraries and daemons
 
 # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
@@ -14,6 +14,9 @@ Patch1: 0001-kernel-boot-Do-not-perform-device-rename-on-OPA-devi.patch
 # Do not build static libs by default.
 %define with_static %{?_with_static: 1} %{?!_with_static: 0}
 
+# 32-bit arm is missing required arch-specific memory barriers,
+ExcludeArch: %{arm}
+
 BuildRequires: binutils
 BuildRequires: cmake >= 2.8.11
 BuildRequires: gcc
@@ -57,8 +60,6 @@ Requires: dracut, kmod, systemd, pciutils
 Provides: rdma = %{version}-%{release}
 Obsoletes: rdma < %{version}-%{release}
 Conflicts: infiniband-diags <= 1.6.7
-# 32-bit arm is missing required arch-specific memory barriers,
-ExcludeArch: %{arm}
 
 # Since we recommend developers use Ninja, so should packagers, for consistency.
 %define CMAKE_FLAGS %{nil}
@@ -294,7 +295,7 @@ easy, object-oriented access to IB verbs.
          -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \
          -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \
          -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-         -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
+         -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \
          -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
          -DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \
          -DENABLE_IBDIAGS_COMPAT:BOOL=True \
@@ -379,11 +380,11 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 
 %files
 %dir %{_sysconfdir}/rdma
-%dir %{_docdir}/%{name}-%{version}
-%doc %{_docdir}/%{name}-%{version}/README.md
-%doc %{_docdir}/%{name}-%{version}/rxe.md
-%doc %{_docdir}/%{name}-%{version}/udev.md
-%doc %{_docdir}/%{name}-%{version}/tag_matching.md
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/README.md
+%doc %{_docdir}/%{name}/rxe.md
+%doc %{_docdir}/%{name}/udev.md
+%doc %{_docdir}/%{name}/tag_matching.md
 %config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/infiniband.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/iwarp.conf
@@ -420,7 +421,7 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 %license COPYING.*
 
 %files devel
-%doc %{_docdir}/%{name}-%{version}/MAINTAINERS
+%doc %{_docdir}/%{name}/MAINTAINERS
 %dir %{_includedir}/infiniband
 %dir %{_includedir}/rdma
 %{_includedir}/infiniband/*
@@ -561,7 +562,7 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 %{_libdir}/libmlx5.so.*
 %{_libdir}/libmlx4.so.*
 %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
-%doc %{_docdir}/%{name}-%{version}/libibverbs.md
+%doc %{_docdir}/%{name}/libibverbs.md
 
 %files -n libibverbs-utils
 %{_bindir}/ibv_*
@@ -579,7 +580,7 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 %{_unitdir}/ibacm.socket
 %dir %{_libdir}/ibacm
 %{_libdir}/ibacm/*
-%doc %{_docdir}/%{name}-%{version}/ibacm.md
+%doc %{_docdir}/%{name}/ibacm.md
 
 %files -n iwpmd
 %{_sbindir}/iwpmd
@@ -597,7 +598,7 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 %{_libdir}/librdmacm*.so.*
 %dir %{_libdir}/rsocket
 %{_libdir}/rsocket/*.so*
-%doc %{_docdir}/%{name}-%{version}/librdmacm.md
+%doc %{_docdir}/%{name}/librdmacm.md
 %{_mandir}/man7/rsocket.*
 
 %files -n librdmacm-utils
@@ -642,15 +643,18 @@ rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
 %{_mandir}/man5/srp_daemon_port@.service.5*
 %{_mandir}/man8/ibsrpdm.8*
 %{_mandir}/man8/srp_daemon.8*
-%doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
+%doc %{_docdir}/%{name}/ibsrpdm.md
 
 %if %{with_pyverbs}
 %files -n python3-pyverbs
 %{python3_sitearch}/pyverbs
-%{_docdir}/%{name}-%{version}/tests/*.py
+%{_docdir}/%{name}/tests/*.py
 %endif
 
 %changelog
+* Mon Jun 15 2020 Honggang Li <honli@redhat.com> - 30.0-1
+- Rebase to upstream release v30.0
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 29.0-2
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 0e9bca6..8e5b0c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rdma-core-29.0.tar.gz) = cd26ad3c04d5bded25f9932eb97f7d5653df25ceedc559548ddd129aad5137cf71debf3972c80c7c1d05ae8fe34fcd9534ce36dfcc3a5ac594c73d54e79a37e6
+SHA512 (rdma-core-30.0.tar.gz) = 8355792c3b69f2c07e511097b67bd3493acfceb771e68f8166814059dd62fcc05876a5f46172082385794b75f47be24134dbf377c787974d1fc67dc096023c8b