import CS eth-tools-11.5.0.0-173.el8

.eth-tools.metadata

@@ -1 +1 @@
-d372f5dd634672cf63aea4e0428d0857b2a68e17 SOURCES/eth-fast-fabric-11.1.0.1.tar.gz
+e7c66ed62392131e2dc3bb161a63f0d17bf3a371 SOURCES/v11.5.0.0.tar.gz

.gitignore

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

SOURCES/eth-fast-fabric-11-almalinux_support.patch

@@ -1,119 +0,0 @@
-diff -aruN eth-fast-fabric-11.1.0.1/CommonInstall/util_init.pl eth-fast-fabric-11.1.0.1.alma/CommonInstall/util_init.pl
---- eth-fast-fabric-11.1.0.1/CommonInstall/util_init.pl	2021-11-02 20:38:31.000000000 +0300
-+++ eth-fast-fabric-11.1.0.1.alma/CommonInstall/util_init.pl	2022-02-17 10:21:19.000000000 +0300
-@@ -305,6 +305,8 @@
- 		$CUR_DISTRO_VENDOR = "redhat";
- 	} elsif ( -s "/etc/centos-release" ) {
- 		$CUR_DISTRO_VENDOR = "redhat";
-+	} elsif ( -s "/etc/almalinux-release" ) {
-+		$CUR_DISTRO_VENDOR = "redhat";
- 	} elsif ( -s "/etc/rocky-release" ) {
- 		$CUR_DISTRO_VENDOR = "redhat";
- 	} elsif ( -s "/etc/UnitedLinux-release" ) {
-@@ -323,6 +325,7 @@
- 	} elsif ( -e $os_release_file) {
- 		my %distroVendor = (
- 			"rhel" => "redhat",
-+			"almalinux" => "redhat",
- 			"centos" => "redhat",
- 			"rocky" => "redhat",
- 			"sles" => "SuSE",
-@@ -330,6 +333,7 @@
- 		);
- 		my %network_conf_dir  = (
- 			"rhel" => $NETWORK_CONF_DIR,
-+			"almalinux" => $NETWORK_CONF_DIR,
- 			"centos" => $NETWORK_CONF_DIR,
- 			"rocky" => $NETWORK_CONF_DIR,
- 			"sles" => "/etc/sysconfig/network",
-@@ -361,6 +365,8 @@
- 			$NETWORK_CONF_DIR = "/etc/sysconfig/network";
- 		} elsif ($CUR_DISTRO_VENDOR eq "centos") {
- 			$CUR_DISTRO_VENDOR = "redhat";
-+		} elsif ($CUR_DISTRO_VENDOR eq "almalinux") {
-+			$CUR_DISTRO_VENDOR = "redhat";
- 		} elsif ($CUR_DISTRO_VENDOR eq "rocky") {
- 			$CUR_DISTRO_VENDOR = "redhat";
- 		}
-diff -aruN eth-fast-fabric-11.1.0.1/MakeTools/funcs-ext.sh eth-fast-fabric-11.1.0.1.alma/MakeTools/funcs-ext.sh
---- eth-fast-fabric-11.1.0.1/MakeTools/funcs-ext.sh	2021-11-02 20:38:31.000000000 +0300
-+++ eth-fast-fabric-11.1.0.1.alma/MakeTools/funcs-ext.sh	2022-02-17 10:23:59.000000000 +0300
-@@ -725,6 +725,9 @@
-             centos)
-                 rval=redhat
-                 ;;
-+            almalinux)
-+                rval=redhat
-+                ;;
-             rocky)
-                 rval=redhat
-                 ;;
-@@ -759,6 +762,9 @@
- 		elif [ $rval = 'centos' ]
- 		then
- 			rval=redhat
-+		elif [ $rval = 'almalinux' ]
-+		then
-+			rval=redhat
- 		elif [ $rval = 'rocky' ]
- 		then
- 			rval=redhat
-@@ -836,6 +842,10 @@
- 		then
- 			# CentOS 
- 			rval="ES"`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1\2/'`
-+		elif grep -qi almalinux /etc/redhat-release
-+		then
-+			# AlmaLinux 
-+			rval="ES"`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1\2/'`
- 		elif grep -qi rocky /etc/redhat-release
- 		then
- 			# Rocky Linux
-diff -aruN eth-fast-fabric-11.1.0.1/OpenIb_Host/update_mpi_spec.sh eth-fast-fabric-11.1.0.1.alma/OpenIb_Host/update_mpi_spec.sh
---- eth-fast-fabric-11.1.0.1/OpenIb_Host/update_mpi_spec.sh	2021-11-02 20:38:31.000000000 +0300
-+++ eth-fast-fabric-11.1.0.1.alma/OpenIb_Host/update_mpi_spec.sh	2022-02-17 10:24:56.000000000 +0300
-@@ -33,7 +33,7 @@
- id=$(./get_id_and_versionid.sh | cut -f1 -d' ')
- versionid=$(./get_id_and_versionid.sh | cut -f2 -d' ')
- 
--if [ "$id" = "rhel" -o "$id" = "centos" -o "$id" = "rocky" ]
-+if [ "$id" = "rhel" -o "$id" = "centos" -o "$id" = "rocky" -o "$id" = "almalinux" ]
- then
- 	GE_8_0=$(echo "$versionid >= 8.0" | bc)
- 	sed -i "s/__RPM_REQ/Requires: openblas-devel/" mpi-apps.spec
-diff -aruN eth-fast-fabric-11.1.0.1/get_id_and_versionid.sh eth-fast-fabric-11.1.0.1.alma/get_id_and_versionid.sh
---- eth-fast-fabric-11.1.0.1/get_id_and_versionid.sh	2021-11-02 20:38:31.000000000 +0300
-+++ eth-fast-fabric-11.1.0.1.alma/get_id_and_versionid.sh	2022-02-17 10:22:28.000000000 +0300
-@@ -29,6 +29,9 @@
- 			elif [ $rval = 'centos' ]
- 			then
- 				rval=redhat
-+			elif [ $rval = 'almalinux' ]
-+			then
-+				rval=redhat
- 			elif [ $rval = 'rocky' ]
- 			then
- 				rval=redhat
-@@ -70,6 +73,10 @@
- 		then
- 			# CentOS 
- 			rval=`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1.\2/'`
-+		elif grep -qi almalinux /etc/redhat-release
-+		then
-+			# AlmaLinux 
-+			rval=`cat /etc/redhat-release | sed -r 's/^.+([[:digit:]])\.([[:digit:]]).+$/\1.\2/'`
- 		elif grep -qi rocky /etc/redhat-release
- 		then
- 			# Rocky Linux
-diff -aruN eth-fast-fabric-11.1.0.1/update_eth_spec.sh eth-fast-fabric-11.1.0.1.alma/update_eth_spec.sh
---- eth-fast-fabric-11.1.0.1/update_eth_spec.sh	2021-11-02 20:38:31.000000000 +0300
-+++ eth-fast-fabric-11.1.0.1.alma/update_eth_spec.sh	2022-02-17 10:25:37.000000000 +0300
-@@ -48,7 +48,7 @@
- 
- source ./OpenIb_Host/ff_filegroups.sh
- 
--if [ "$id" = "rhel" -o "$id" = "centos" -o "$id" = "rocky" ]
-+if [ "$id" = "rhel" -o "$id" = "centos" -o "$id" = "rocky" -o "$id" = "almalinux" ]
- then
- 	# __RPM_REQ_BASIC -
- 	sed -i "s/__RPM_REQ_BASIC1/expect%{?_isa}, tcl%{?_isa}, libibverbs-utils%{?_isa}, librdmacm-utils%{?_isa}, net-snmp-utils%{?_isa}/g" eth-tools.spec

SPECS/eth-tools.spec

@@ -1,15 +1,11 @@
 Name: eth-tools
-Version: 11.1.0.1
+Version: 11.5.0.0
-Release: 5%{?dist}.alma
+Release: 173%{?dist}
 Summary: Intel Ethernet Fabric Suite basic tools and libraries for fabric management
 
 License: BSD
 Url: https://github.com/intel/eth-fast-fabric
-Source: %url/archive/%{version}/eth-fast-fabric-%{version}.tar.gz
+Source: %url/archive/refs/tags/v%{version}.tar.gz
-
-#AlmaLinux patches
-Patch0: eth-fast-fabric-11-almalinux_support.patch
-
 ExclusiveArch: x86_64
 # The Intel(R) Ethernet Fabric Suite product line is only available on x86_64 platforms at this time.
 
@@ -23,7 +19,7 @@ Summary: Management level tools and scripts
 
 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: expat-devel
 BuildRequires: gcc-c++
@@ -31,6 +27,7 @@ BuildRequires: tcl-devel
 BuildRequires: rdma-core-devel
 BuildRequires: net-snmp-devel
 
+
 %description basic
 Contains basic tools for fabric management necessary on all compute nodes.
 
@@ -43,7 +40,7 @@ Requires: eth-tools-basic%{?_isa} >= %{version}-%{release}
 Contains tools for managing fabric on a management node.
 
 %prep
-%autosetup -n eth-fast-fabric-%{version} -p 1
+%autosetup -n eth-fast-fabric-%{version}
 
 %build
 cd OpenIb_Host
@@ -53,20 +50,26 @@ OPA_FEATURE_SET= CLOCAL='%build_cflags' CCLOCAL='%build_cxxflags' LDLOCAL='%buil
 BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_prefix}/lib DSAP_LIBDIR=%{_libdir} ./OpenIb_Host/ff_install.sh
 
 %files basic
+%{_sbindir}/ethbw
 %{_sbindir}/ethcapture
+%{_sbindir}/ethshmcleanup
 %{_prefix}/lib/eth-tools/setup_self_ssh
 %{_prefix}/lib/eth-tools/usemem
 %{_prefix}/lib/eth-tools/ethipcalc
 %{_prefix}/lib/eth-tools/stream
 %{_prefix}/lib/eth-tools/ethudstress
+%{_mandir}/man1/ethbw.1*
 %{_mandir}/man1/ethcapture.1*
+%{_mandir}/man1/ethshmcleanup.1*
 %{_datadir}/eth-tools/samples/mgt_config.xml-sample
 %dir %{_sysconfdir}/eth-tools/
 %config(noreplace) %{_sysconfdir}/eth-tools/mgt_config.xml
 
 %files fastfabric
 %{_sbindir}/*
+%exclude %{_sbindir}/ethbw
 %exclude %{_sbindir}/ethcapture
+%exclude %{_sbindir}/ethshmcleanup
 %{_prefix}/lib/eth-tools/*
 %exclude %{_prefix}/lib/eth-tools/setup_self_ssh
 %exclude %{_prefix}/lib/eth-tools/usemem
@@ -88,8 +91,18 @@ BUILDDIR=%{_builddir} DESTDIR=%{buildroot} LIBDIR=%{_prefix}/lib DSAP_LIBDIR=%{_
 
 
 %changelog
-* Fri Apr 01 2022 Eduard Abdullin <eabdullin@almalinux.org> - 11.1.0.1-5.alma
+* Fri Jun 02 2023 Kamal Heib <kheib@redhat.com> - 1:11.5.0.0-173
-- AlmaLinux changes
+- Update to upstream release 11.5.0.0
+- Add gating tests
+- Resolves: rhbz#2144025
+
+* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 11.4.0.0-201
+- Update to upstream release 11.4.0.0
+- Resolves: rhbz#2168118
+
+* Wed Aug 17 2022 Michal Schmidt <mschmidt@redhat.com> - 11.3.0.0-1
+- Update to upstream release 11.3.0.0
+- Resolves: rhbz#2037048
 
 * Tue Nov 09 2021 Honggang Li <honli@redhat.com> - 11.1.0.1-5
 - Update to upstream release 11.1.0.1