update to 28.1

This commit is contained in:
cuibb1 2020-07-27 18:25:57 +08:00
parent 3077663215
commit 19b916d795
3 changed files with 170 additions and 82 deletions

Binary file not shown.

BIN
rdma-core-28.1.tar.gz Normal file

Binary file not shown.

View File

@ -1,25 +1,59 @@
Name: rdma-core Name: rdma-core
Version: 20.1 Version: 28.1
Release: 6 Release: 2
Summary: RDMA core userspace libraries and daemons Summary: RDMA core userspace libraries and daemons
License: GPLv2 or BSD License: GPLv2 or BSD
URL: https://github.com/linux-rdma/rdma-core Url: https://github.com/linux-rdma/rdma-core
Source0: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz Source: https://github.com/linux-rdma/rdma-core/releases/download/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: binutils cmake gcc libudev-devel pkgconfig libnl3-devel systemd BuildRequires: binutils cmake >= 2.8.11 gcc libudev-devel pkgconfig pkgconfig(libnl-3.0)
BuildRequires: systemd-devel valgrind-devel python3 perl-generators make BuildRequires: pkgconfig(libnl-route-3.0) valgrind-devel systemd systemd-devel
BuildRequires: python3-devel python3-Cython python3 python3-docutils perl-generators
BuildRequires: ninja-build
Requires: dracut kmod systemd Requires: dracut kmod systemd pciutils
Provides: rdma rdma-ndd libibverbs libcxgb3 libcxgb4 libhfi1 libi40iw libipathverbs Provides: ibacm infiniband-diags-compat infiniband-diags libibverbs libibverbs-utils iwpmd libibumad librdmacm librdmacm-utils srp_daemon
Obsoletes: rdma rdma-ndd libibverbs libcxgb3 libcxgb4 libhfi1 libi40iw libipathverbs libehca < 1.2.2-7 Obsoletes: ibacm infiniband-diags-compat infiniband-diags libibverbs libibverbs-utils iwpmd libibumad librdmacm librdmacm-utils srp_daemon
Provides: libmlx4 libmlx5 libmthca libnes libocrdma librxe libusnic_verbs libibverbs-utils
Obsoletes: libmlx4 libmlx5 libmthca libnes libocrdma librxe libusnic_verbs libibverbs-utils Provides: rdma = %{version}-%{release}
Provides: ibacm iwpmd libibumad librdmacm librdmacm-utils srp_daemon srptools Obsoletes: rdma < %{version}-%{release}
Obsoletes: ibacm iwpmd libibumad librdmacm librdmacm-utils srp_daemon srptools openib-srptools <= 0.0.6 Provides: perl(IBswcountlimits)
Provides: libibmad = %{version}-%{release}
Obsoletes: libibmad < %{version}-%{release}
Obsoletes: openib-diags < 1.3
Provides: libcxgb4 = %{version}-%{release}
Obsoletes: libcxgb4 < %{version}-%{release}
Provides: libefa = %{version}-%{release}
Obsoletes: libefa < %{version}-%{release}
Provides: libhfi1 = %{version}-%{release}
Obsoletes: libhfi1 < %{version}-%{release}
Provides: libi40iw = %{version}-%{release}
Obsoletes: libi40iw < %{version}-%{release}
Provides: libipathverbs = %{version}-%{release}
Obsoletes: libipathverbs < %{version}-%{release}
Provides: libmlx4 = %{version}-%{release}
Obsoletes: libmlx4 < %{version}-%{release}
Provides: libmlx5 = %{version}-%{release}
Obsoletes: libmlx5 < %{version}-%{release}
Provides: libmthca = %{version}-%{release}
Obsoletes: libmthca < %{version}-%{release}
Provides: libocrdma = %{version}-%{release}
Obsoletes: libocrdma < %{version}-%{release}
Provides: librxe = %{version}-%{release}
Obsoletes: librxe < %{version}-%{release}
Obsoletes: srptools <= 1.0.3
Provides: srptools = %{version}-%{release}
Obsoletes: openib-srptools <= 0.0.6
Conflicts: infiniband-diags <= 1.6.7
%{?systemd_requires} %{?systemd_requires}
%define CMAKE_FLAGS -GNinja
%define make_jobs ninja-build -v %{?_smp_mflags}
%define cmake_install DESTDIR=%{buildroot} ninja-build install
%description %description
This is the userspace components for the Linux Kernel's drivers/infiniband subsystem. This is the userspace components for the Linux Kernel's drivers/infiniband subsystem.
Specifically this contains the userspace libraries for the following device nodes: Specifically this contains the userspace libraries for the following device nodes:
@ -29,24 +63,47 @@ Specifically this contains the userspace libraries for the following device node
- /dev/infiniband/umadX (libibumad) - /dev/infiniband/umadX (libibumad)
%package devel %package devel
Summary: header files for rdma-core Summary: RDMA core development libraries and headers
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Provides: libibverbs-devel libibverbs-devel-static libibumad-devel libibumad-static Provides: libibverbs-devel = %{version}-%{release}
Obsoletes: libibverbs-devel libibverbs-devel-static libibumad-devel libibumad-static Obsoletes: libibverbs-devel < %{version}-%{release}
Provides: librdmacm-devel librdmacm-static ibacm-devel libcxgb3-static libcxgb4-static Provides: libibumad-devel = %{version}-%{release}
Obsoletes: librdmacm-devel librdmacm-static ibacm-devel libcxgb3-static libcxgb4-static Obsoletes: libibumad-devel < %{version}-%{release}
Provides: libhfi1-static libipathverbs-static libmlx4-static libmlx5-static libnes-static Provides: librdmacm-devel = %{version}-%{release}
Obsoletes: libhfi1-static libipathverbs-static libmlx4-static libmlx5-static libnes-static Obsoletes: librdmacm-devel < %{version}-%{release}
Provides: libocrdma-static libi40iw-devel-static libmthca-static Provides: ibacm-devel = %{version}-%{release}
Obsoletes: libocrdma-static libi40iw-devel-static libmthca-static libibcm-devel Obsoletes: ibacm-devel < %{version}-%{release}
Provides: infiniband-diags-devel = %{version}-%{release}
Obsoletes: infiniband-diags-devel < %{version}-%{release}
Provides: libibmad-devel = %{version}-%{release}
Obsoletes: libibmad-devel < %{version}-%{release}
BuildRequires: pkgconfig(libnl-3.0) pkgconfig(libnl-route-3.0)
%description devel %description devel
Header files for rdma-core. RDMA core development libraries and headers.
%package_help %package -n python3-pyverbs
Summary: Python3 API over IB verbs
%{?python_provide:%python_provide python3-pyverbs}
%description -n python3-pyverbs
Pyverbs is a Cython-based Python API over libibverbs, providing an
easy, object-oriented access to IB verbs.
%package help
Summary: Documents for %{name}
Buildarch: noarch
Requires: man info
Provides: infiniband-diags-help = %{version}-%{release}
Obsoletes: infiniband-diags-help < %{version}-%{release}
%description help
Man pages and other related documents for %{name}.
%prep %prep
%autosetup -n %{name}-%{version} -p1 %setup
%autosetup -v -p1
%build %build
%if 0%{?_rundir:1} %if 0%{?_rundir:1}
@ -54,9 +111,6 @@ Header files for rdma-core.
%define _rundir /var/run %define _rundir /var/run
%endif %endif
%define make_jobs make -v %{?_smp_mflags}
%define cmake_install DESTDIR=%{buildroot} make install
%{!?EXTRA_CMAKE_FLAGS: %define EXTRA_CMAKE_FLAGS %{nil}} %{!?EXTRA_CMAKE_FLAGS: %define EXTRA_CMAKE_FLAGS %{nil}}
%cmake %{CMAKE_FLAGS} \ %cmake %{CMAKE_FLAGS} \
@ -76,47 +130,50 @@ Header files for rdma-core.
-DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \ -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \ -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \
-DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} \
-DENABLE_IBDIAGS_COMPAT:BOOL=True \
-DENABLE_STATIC=1 \
%{EXTRA_CMAKE_FLAGS} \ %{EXTRA_CMAKE_FLAGS} \
. -DPYTHON_EXECUTABLE:PATH=%{__python3} \
-DCMAKE_INSTALL_PYTHON_ARCH_LIB:PATH=%{python3_sitearch} \
-DNO_PYVERBS=0
%make_jobs %make_jobs
%install %install
%cmake_install %cmake_install
mkdir -p %{buildroot}/%{_sysconfdir}/rdma
%global dracutlibdir %{_prefix}/lib/dracut %global dracutlibdir %{_prefix}/lib/dracut
%global sysmodprobedir %{_prefix}/lib/modprobe.d %global sysmodprobedir %{_prefix}/lib/modprobe.d
mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
pushd redhat/ mkdir -p %{buildroot}%{_libexecdir}
install -m 0644 rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf mkdir -p %{buildroot}%{_udevrulesdir}
install -m 0644 rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
install -m 0644 rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf mkdir -p %{buildroot}%{sysmodprobedir}
install -D -m 0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf
install -m 0755 -d %{buildroot}%{sysmodprobedir} install -D -m 0644 redhat/rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs
install -m 0644 rdma.mlx4.sys.modprobe %{buildroot}/%{sysmodprobedir}/libmlx4.conf install -D -m 0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf
install -D -m 0644 redhat/rdma.service %{buildroot}%{_unitdir}/rdma.service
install -m 0755 -d %{buildroot}%{_libexecdir} install -D -m 0755 redhat/rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
install -m 0755 rdma.mlx4-setup.sh %{buildroot}/%{_libexecdir}/mlx4-setup.sh install -D -m 0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules
install -D -m 0644 redhat/rdma.mlx4.sys.modprobe %{buildroot}%{sysmodprobedir}/libmlx4.conf
install -m 0755 -d %{buildroot}%{_unitdir} install -D -m 0755 redhat/rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel
install -m 0644 rdma.service %{buildroot}%{_unitdir}/rdma.service install -D -m 0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf
install -D -m 0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
install -m 0755 -d %{buildroot}%{dracutlibdir}/modules.d/05rdma
install -m 0755 rdma.modules-setup.sh %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
install -m 0755 -d %{buildroot}%{_udevrulesdir}
install -m 0644 rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules
install -m 0755 -d %{buildroot}%{_libexecdir}
install -m 0755 rdma.kernel-init %{buildroot}%{_libexecdir}/rdma-init-kernel
install -m 0755 rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf
popd
bin/ib_acme -D . -O bin/ib_acme -D . -O
install -m 0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/ install -D -m 0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
rm -rf %{buildroot}/%{_initrddir}/
rm -f %{buildroot}/%{_sbindir}/srp_daemon.sh
%ldconfig_scriptlets %ldconfig_scriptlets
%post %post
/sbin/udevadm trigger --subsystem-match=infiniband --action=change || true
/sbin/udevadm trigger --subsystem-match=net --action=change || true
/sbin/udevadm trigger --subsystem-match=infiniband_mad --action=change || true
%systemd_post ibacm.service %systemd_post ibacm.service
%systemd_post srp_daemon.service %systemd_post srp_daemon.service
%systemd_post iwpmd.service %systemd_post iwpmd.service
@ -134,44 +191,56 @@ install -m 0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%license COPYING.* %license COPYING.*
%{sysmodprobedir}/libmlx4.conf
%config(noreplace) %{_sysconfdir}/*.conf
%config(noreplace) %{_sysconfdir}/rdma/*.conf %config(noreplace) %{_sysconfdir}/rdma/*.conf
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%config(noreplace) %{_sysconfdir}/rdma/sriov-vfs
%config(noreplace) %{_sysconfdir}/rdma/ibacm_opts.cfg
%config(noreplace) %{_sysconfdir}/rdma/modules/*.conf %config(noreplace) %{_sysconfdir}/rdma/modules/*.conf
%config(noreplace) %{_sysconfdir}/rdma/sriov-vfs
%config(noreplace) %{_sysconfdir}/udev/rules.d/*
%config(noreplace) %{_sysconfdir}/modprobe.d/*.conf %config(noreplace) %{_sysconfdir}/modprobe.d/*.conf
%config(noreplace) %{_sysconfdir}/infiniband-diags/*
%config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
%{_libexecdir}/mlx4-setup.sh %config(noreplace) %{_sysconfdir}/rdma/ibacm_opts.cfg
%config(noreplace) %{_sysconfdir}/iwpmd.conf
%config(noreplace) %{_sysconfdir}/srp_daemon.conf
%{dracutlibdir}/modules.d/05rdma/module-setup.sh %{dracutlibdir}/modules.d/05rdma/module-setup.sh
%{_udevrulesdir}/../rdma_rename
%{_udevrulesdir}/*.rules
%{sysmodprobedir}/libmlx4.conf
%{perl_vendorlib}/IBswcountlimits.pm
%{_libexecdir}/rdma-init-kernel
%{_libexecdir}/rdma-set-sriov-vf
%{_libexecdir}/mlx4-setup.sh
%{_libexecdir}/truescale-serdes.cmds
%{_libexecdir}/srp_daemon/start_on_all_ports
%{_sbindir}/* %{_sbindir}/*
%{_bindir}/* %{_bindir}/*
%{_unitdir}/* %{_unitdir}/*
%{_udevrulesdir}/*.rules %{_libdir}/libibmad*.so.*
%{_libexecdir}/rdma-init-kernel %{_libdir}/libibnetdisc*.so.*
%{_libexecdir}/rdma-set-sriov-vf %{_libdir}/libefa.so.*
%{_libexecdir}/truescale-serdes.cmds
%{_libexecdir}/srp_daemon/start_on_all_ports
%{_libdir}/ibacm/*
%{_libdir}/libmlx4.so.*
%{_libdir}/libmlx5.so.*
%{_libdir}/libibverbs*.so.* %{_libdir}/libibverbs*.so.*
%{_libdir}/libibverbs/*.so %{_libdir}/libibverbs/*.so
%{_libdir}/libmlx5.so.*
%{_libdir}/libmlx4.so.*
%{_libdir}/ibacm/*
%{_libdir}/libibumad*.so.* %{_libdir}/libibumad*.so.*
%{_libdir}/librdmacm*.so.* %{_libdir}/librdmacm*.so.*
%{_libdir}/rsocket/*.so* %{_libdir}/rsocket/*.so*
%exclude %{_initrddir}/*
%exclude %{_sbindir}/srp_daemon.sh
%files devel
%files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/infiniband/*
%{_includedir}/rdma/*
%{_libdir}/lib*.a
%{_libdir}/lib*.so %{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_includedir}/rdma/*
%{_includedir}/infiniband/*
%files help %files -n python3-pyverbs
%defattr(-,root,root)
%{python3_sitearch}/pyverbs
%{_docdir}/%{name}-%{version}/tests/*.py
%files help
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_docdir}/%{name}-%{version}/rxe.md %doc %{_docdir}/%{name}-%{version}/rxe.md
%doc %{_docdir}/%{name}-%{version}/udev.md %doc %{_docdir}/%{name}-%{version}/udev.md
@ -185,6 +254,24 @@ install -m 0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
%{_mandir}/* %{_mandir}/*
%changelog %changelog
* Mon Apr 20 2020 majun <majun65@huawei.com> - 28.1-2
- Type: bugfix
- ID: NA
- SUG: NA
- DESC: fix install problem
* Sat Apr 18 2020 majun <majun65@huawei.com> - 28.1-1
- Type: bugfix
- ID: NA
- SUG: NA
- DESC: update to 28.1
* Thu Mar 19 2020 wangxiaopeng <wangxiaopeng7@huawei.com> - 20.1-7
- Type: bugfix
- ID: NA
- SUG: NA
- DESC: fix upgrate problem
* Fri Oct 11 2019 jiangchuangang <jiangchuangang@huawei.com> - 20.1-6 * Fri Oct 11 2019 jiangchuangang <jiangchuangang@huawei.com> - 20.1-6
- Type: enhancement - Type: enhancement
- ID: NA - ID: NA
@ -193,3 +280,4 @@ install -m 0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
* Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 20.1-5 * Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 20.1-5
- Package init - Package init