Merge branch 'c9-beta' into a9-beta

This commit is contained in:
eabdullin 2022-10-17 13:13:40 +03:00
commit bc11aaa174
3 changed files with 15 additions and 9 deletions

View File

@ -1 +1 @@
d372f5dd634672cf63aea4e0428d0857b2a68e17 SOURCES/eth-fast-fabric-11.1.0.1.tar.gz 9410d3e83e205e922ea0b6a3d1c23b1625c272a3 SOURCES/v11.3.0.0.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/eth-fast-fabric-11.1.0.1.tar.gz SOURCES/v11.3.0.0.tar.gz

View File

@ -1,13 +1,12 @@
Name: eth-tools Name: eth-tools
Version: 11.1.0.1 Version: 11.3.0.0
Release: 5%{?dist}.alma Release: 1%{?dist}.alma
Summary: Intel Ethernet Fabric Suite basic tools and libraries for fabric management Summary: Intel Ethernet Fabric Suite basic tools and libraries for fabric management
License: BSD License: BSD
Url: https://github.com/intel/eth-fast-fabric Url: https://github.com/intel/eth-fast-fabric
Source: %url/archive/%{version_no_tilde}/eth-fast-fabric-%{version_no_tilde}.tar.gz Source: %url/archive/refs/tags/v%{version_no_tilde}.tar.gz
Patch0: eth-fast-fabric-11-almalinux_support.patch Patch0: eth-fast-fabric-11-almalinux_support.patch
ExclusiveArch: x86_64 ExclusiveArch: x86_64
# The Intel(R) Ethernet Fabric Suite product line is only available on x86_64 platforms at this time. # The Intel(R) Ethernet Fabric Suite product line is only available on x86_64 platforms at this time.
@ -21,7 +20,7 @@ Summary: Management level tools and scripts
Requires: rdma bc Requires: rdma bc
Requires: expect%{?_isa}, tcl%{?_isa}, libibverbs-utils%{?_isa}, librdmacm-utils%{?_isa}, net-snmp-utils%{?_isa} Requires: expect%{?_isa}, tcl%{?_isa}, libibverbs-utils%{?_isa}, librdmacm-utils%{?_isa}, net-snmp%{?_isa}, net-snmp-utils%{?_isa}
BuildRequires: make BuildRequires: make
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -35,8 +34,8 @@ Contains basic tools for fabric management necessary on all compute nodes.
%package fastfabric %package fastfabric
Summary: Management level tools and scripts Summary: Management level tools and scripts
Requires: perl
Requires: eth-tools-basic%{?_isa} >= %{version}-%{release} Requires: eth-tools-basic%{?_isa} >= %{version}-%{release}
Requires: perl cronie
%description fastfabric %description fastfabric
Contains tools for managing fabric on a management node. Contains tools for managing fabric on a management node.
@ -53,12 +52,14 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_prefix}/lib DSAP_LIBDIR=%{_
%files basic %files basic
%{_sbindir}/ethcapture %{_sbindir}/ethcapture
%{_sbindir}/ethshmcleanup
%{_prefix}/lib/eth-tools/setup_self_ssh %{_prefix}/lib/eth-tools/setup_self_ssh
%{_prefix}/lib/eth-tools/usemem %{_prefix}/lib/eth-tools/usemem
%{_prefix}/lib/eth-tools/ethipcalc %{_prefix}/lib/eth-tools/ethipcalc
%{_prefix}/lib/eth-tools/stream %{_prefix}/lib/eth-tools/stream
%{_prefix}/lib/eth-tools/ethudstress %{_prefix}/lib/eth-tools/ethudstress
%{_mandir}/man1/ethcapture.1* %{_mandir}/man1/ethcapture.1*
%{_mandir}/man1/ethshmcleanup.1*
%{_datadir}/eth-tools/samples/mgt_config.xml-sample %{_datadir}/eth-tools/samples/mgt_config.xml-sample
%dir %{_sysconfdir}/eth-tools/ %dir %{_sysconfdir}/eth-tools/
%config(noreplace) %{_sysconfdir}/eth-tools/mgt_config.xml %config(noreplace) %{_sysconfdir}/eth-tools/mgt_config.xml
@ -66,6 +67,7 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_prefix}/lib DSAP_LIBDIR=%{_
%files fastfabric %files fastfabric
%{_sbindir}/* %{_sbindir}/*
%exclude %{_sbindir}/ethcapture %exclude %{_sbindir}/ethcapture
%exclude %{_sbindir}/ethshmcleanup
%{_prefix}/lib/eth-tools/* %{_prefix}/lib/eth-tools/*
%exclude %{_prefix}/lib/eth-tools/setup_self_ssh %exclude %{_prefix}/lib/eth-tools/setup_self_ssh
%exclude %{_prefix}/lib/eth-tools/usemem %exclude %{_prefix}/lib/eth-tools/usemem
@ -87,9 +89,13 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_prefix}/lib DSAP_LIBDIR=%{_
%changelog %changelog
* Mon Feb 14 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:11.1.0.1-5.alma * Mon Oct 17 2022 Eduard Abdullin <eabdullin@almalinux.org> - 1:11.3.0.0-1.alma
- Add AlmaLinux support - Add AlmaLinux support
* Wed Aug 03 2022 Michal Schmidt <mschmidt@redhat.com> - 1:11.3.0.0-1
- Update to upstream release 11.3.0.0
- Resolves: rhbz#2037052
* Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 1:11.1.0.1-5 * Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 1:11.1.0.1-5
- Update to upstream release 11.1.0.1 - Update to upstream release 11.1.0.1
- Fix annocheck issues - Fix annocheck issues