diff --git a/.gitignore b/.gitignore index 9ef3895..b809240 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /rdma-core-29.0.tar.gz /rdma-core-30.0.tar.gz /rdma-core-31.0.tar.gz +/rdma-core-33.0.tar.gz diff --git a/rdma-core.spec b/rdma-core.spec index daa2423..ab55d35 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core -Version: 32.0 -Release: 2%{?dist} +Version: 33.0 +Release: 3%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -67,9 +67,14 @@ Conflicts: infiniband-diags <= 1.6.7 # Ninja was introduced in FC23 BuildRequires: ninja-build %define CMAKE_FLAGS -GNinja +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %define make_jobs ninja-build -C %{_vpath_builddir} -v %{?_smp_mflags} %define cmake_install DESTDIR=%{buildroot} ninja-build -C %{_vpath_builddir} install %else +%define make_jobs ninja-build -v %{?_smp_mflags} +%define cmake_install DESTDIR=%{buildroot} ninja-build install +%endif +%else # Fallback to make otherwise BuildRequires: make %define make_jobs make VERBOSE=1 %{?_smp_mflags} @@ -160,6 +165,9 @@ Provides: libocrdma = %{version}-%{release} Obsoletes: libocrdma < %{version}-%{release} Provides: librxe = %{version}-%{release} Obsoletes: librxe < %{version}-%{release} +%if 0%{?fedora} == 34 +Obsoletes: libibverbs-core < %{version}-%{release} +%endif %description -n libibverbs libibverbs is a library that allows userspace processes to use RDMA @@ -258,13 +266,6 @@ easy, object-oriented access to IB verbs. %autosetup -v -p1 %build -# This package uses top level ASM constructs which are incompatible with LTO. -# Top level ASMs are often used to implement symbol versioning. gcc-10 -# introduces a new mechanism for symbol versioning which works with LTO. -# Converting packages to use that mechanism instead of toplevel ASMs is -# recommended. -# Disable LTO -%define _lto_cflags %{nil} # New RPM defines _rundir, usually as /run %if 0%{?_rundir:1} @@ -330,8 +331,9 @@ 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 -install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/ +(if [ -d %{__cmake_builddir} ]; then cd %{__cmake_builddir}; fi + ./bin/ib_acme -D . -O && + install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/) # Delete the package's init.d scripts rm -rf %{buildroot}/%{_initrddir}/ @@ -644,6 +646,15 @@ fi %endif %changelog +* Mon Jan 25 2021 Honggang Li - 33.0-3 +- Fix ELN build issue + +* Thu Jan 21 2021 Honggang Li - 33.0-2 +- libibverbs obsoletes libibverbs-core for fedora-34 + +* Mon Jan 18 2021 Honggang Li - 33.0-1 +- Rebase to upstream release v33.0 + * Mon Jan 18 2021 Honggang Li - 32.0-2 - Remove base package dependency from all sub-packages - Resolves: bz1901086 diff --git a/sources b/sources index d4ffc86..69253ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rdma-core-32.0.tar.gz) = 6d5f791e7b4dd27a18c04bb0b17304890945d8987bf4fbf8ae2329986f38e2ef853b00a7b3b22805cc4e66f636f382d6ea60217273dc98be6d0e1dcb655c1ce2 +SHA512 (rdma-core-33.0.tar.gz) = 32b15cbc256dabd97acaaa040ceb62ccd6b0193617fa17d2a410c9360ef85beb029cc611b2d78edc876555995a5cdd54325ac4b7fb9bec46b0a05a0704462e06