Rebase to upstream release v33.0
Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
parent
ef8db100db
commit
80eb5deac7
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@
|
|||||||
/rdma-core-29.0.tar.gz
|
/rdma-core-29.0.tar.gz
|
||||||
/rdma-core-30.0.tar.gz
|
/rdma-core-30.0.tar.gz
|
||||||
/rdma-core-31.0.tar.gz
|
/rdma-core-31.0.tar.gz
|
||||||
|
/rdma-core-33.0.tar.gz
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
Name: rdma-core
|
Name: rdma-core
|
||||||
Version: 32.0
|
Version: 33.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: RDMA core userspace libraries and daemons
|
Summary: RDMA core userspace libraries and daemons
|
||||||
|
|
||||||
# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
|
# 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
|
# Ninja was introduced in FC23
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
%define CMAKE_FLAGS -GNinja
|
%define CMAKE_FLAGS -GNinja
|
||||||
|
%if 0%{?fedora} >= 33
|
||||||
%define make_jobs ninja-build -C %{_vpath_builddir} -v %{?_smp_mflags}
|
%define make_jobs ninja-build -C %{_vpath_builddir} -v %{?_smp_mflags}
|
||||||
%define cmake_install DESTDIR=%{buildroot} ninja-build -C %{_vpath_builddir} install
|
%define cmake_install DESTDIR=%{buildroot} ninja-build -C %{_vpath_builddir} install
|
||||||
%else
|
%else
|
||||||
|
%define make_jobs ninja-build -v %{?_smp_mflags}
|
||||||
|
%define cmake_install DESTDIR=%{buildroot} ninja-build install
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
# Fallback to make otherwise
|
# Fallback to make otherwise
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
%define make_jobs make VERBOSE=1 %{?_smp_mflags}
|
%define make_jobs make VERBOSE=1 %{?_smp_mflags}
|
||||||
@ -258,13 +263,6 @@ easy, object-oriented access to IB verbs.
|
|||||||
%autosetup -v -p1
|
%autosetup -v -p1
|
||||||
|
|
||||||
%build
|
%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
|
# New RPM defines _rundir, usually as /run
|
||||||
%if 0%{?_rundir:1}
|
%if 0%{?_rundir:1}
|
||||||
@ -330,8 +328,9 @@ rm -f %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf
|
|||||||
install -D -m0644 redhat/rdma.conf %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf
|
install -D -m0644 redhat/rdma.conf %{buildroot}%{_sysconfdir}/rdma/modules/rdma.conf
|
||||||
|
|
||||||
# ibacm
|
# ibacm
|
||||||
%{buildroot}%{_bindir}/ib_acme -D . -O
|
(if [ -d %{__cmake_builddir} ]; then cd %{__cmake_builddir}; fi
|
||||||
install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
|
./bin/ib_acme -D . -O &&
|
||||||
|
install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/)
|
||||||
|
|
||||||
# Delete the package's init.d scripts
|
# Delete the package's init.d scripts
|
||||||
rm -rf %{buildroot}/%{_initrddir}/
|
rm -rf %{buildroot}/%{_initrddir}/
|
||||||
@ -644,6 +643,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 18 2021 Honggang Li <honli@redhat.com> - 33.0-1
|
||||||
|
- Rebase to upstream release v33.0
|
||||||
|
|
||||||
* Mon Jan 18 2021 Honggang Li <honli@redhat.com> - 32.0-2
|
* Mon Jan 18 2021 Honggang Li <honli@redhat.com> - 32.0-2
|
||||||
- Remove base package dependency from all sub-packages
|
- Remove base package dependency from all sub-packages
|
||||||
- Resolves: bz1901086
|
- Resolves: bz1901086
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (rdma-core-32.0.tar.gz) = 6d5f791e7b4dd27a18c04bb0b17304890945d8987bf4fbf8ae2329986f38e2ef853b00a7b3b22805cc4e66f636f382d6ea60217273dc98be6d0e1dcb655c1ce2
|
SHA512 (rdma-core-33.0.tar.gz) = 32b15cbc256dabd97acaaa040ceb62ccd6b0193617fa17d2a410c9360ef85beb029cc611b2d78edc876555995a5cdd54325ac4b7fb9bec46b0a05a0704462e06
|
||||||
|
Loading…
Reference in New Issue
Block a user