From f92c6170e7e479118cba41183a78673433df4f30 Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Nov 02 2020 09:34:23 +0000 Subject: Rebase to upstream release v32.0 Signed-off-by: Honggang Li --- diff --git a/rdma-core.spec b/rdma-core.spec index 9f10f71..13923d3 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core -Version: 31.0 -Release: 2%{?dist} +Version: 32.0 +Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -29,7 +29,7 @@ BuildRequires: valgrind-devel BuildRequires: systemd BuildRequires: systemd-devel %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8 -%define with_pyverbs %{?_with_pyverbs: 0} %{?!_with_pyverbs: 1} +%define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: %{?!_without_pyverbs: 1} %{?_without_pyverbs: 0}} %else %define with_pyverbs %{?_with_pyverbs: 1} %{?!_with_pyverbs: 0} %endif @@ -336,16 +336,12 @@ mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_udevrulesdir} 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 install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf -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 install -D -m0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf -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 install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh +rm -f %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf +install -D -m0644 redhat/rdma.conf %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf # ibacm %{buildroot}%{_bindir}/ib_acme -D . -O @@ -405,15 +401,12 @@ fi %config(noreplace) %{_sysconfdir}/rdma/modules/opa.conf %config(noreplace) %{_sysconfdir}/rdma/modules/rdma.conf %config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf -%config(noreplace) %{_sysconfdir}/rdma/rdma.conf -%config(noreplace) %{_sysconfdir}/rdma/sriov-vfs %config(noreplace) %{_sysconfdir}/udev/rules.d/* %dir %{_sysconfdir}/modprobe.d %config(noreplace) %{_sysconfdir}/modprobe.d/mlx4.conf %config(noreplace) %{_sysconfdir}/modprobe.d/truescale.conf %{_unitdir}/rdma-hw.target %{_unitdir}/rdma-load-modules@.service -%{_unitdir}/rdma.service %dir %{dracutlibdir} %dir %{dracutlibdir}/modules.d %dir %{dracutlibdir}/modules.d/05rdma @@ -426,11 +419,8 @@ fi %{_udevrulesdir}/90-rdma-hw-modules.rules %{_udevrulesdir}/90-rdma-ulp-modules.rules %{_udevrulesdir}/90-rdma-umad.rules -%{_udevrulesdir}/98-rdma.rules %dir %{sysmodprobedir} %{sysmodprobedir}/libmlx4.conf -%{_libexecdir}/rdma-init-kernel -%{_libexecdir}/rdma-set-sriov-vf %{_libexecdir}/mlx4-setup.sh %{_libexecdir}/truescale-serdes.cmds %{_sbindir}/rdma-ndd @@ -673,6 +663,9 @@ fi %endif %changelog +* Thu Oct 29 2020 Honggang Li - 32.0-1 +- Rebase to upstream release v32.0 + * Mon Sep 14 2020 Peter Robinson - 31.0-2 - Split out libibverbs to sub package for libpcap diff --git a/sources b/sources index a6576cd..d4ffc86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rdma-core-31.0.tar.gz) = c9c05f586c10e666fe36176849de3dc614151179758200a48ddd8679e67c1d99203930afc64056b8d41a6fb6f2b583991f91e498c20869bec56ab65e654c9e3d +SHA512 (rdma-core-32.0.tar.gz) = 6d5f791e7b4dd27a18c04bb0b17304890945d8987bf4fbf8ae2329986f38e2ef853b00a7b3b22805cc4e66f636f382d6ea60217273dc98be6d0e1dcb655c1ce2