.gitignore

@@ -1,44 +1 @@
-i386/
+SOURCES/mstflint-4.25.0-1.tar.gz
-i686/
-x86_64/
-ppc/
-ppc64/
-ia64/
-mips/
-arm*/
-noarch/
-.project
-*.src.rpm
-.build*.log
-/mstflint-1.4/
-/mstflint-1.4-1.18.g1adcfbf.tar.gz
-/mstflint-1.4-1.19.redhat.tar.gz
-/mstflint-3.0-0.5.gff93670.tar.gz
-/mstflint-3.0/
-/mstflint-3.0-0.6.g6961daa.tar.gz
-/mstflint-4.1.0-1.46.gb1cdaf7.tar.gz
-/mstflint-4.1.0/
-/mstflint-4.3.0-1.49.g9b9af70.tar.gz
-/mstflint-4.4.0-1.12.gd1edd58.tar.gz
-/mstflint-4.6.0.tar.gz
-/mstflint-4.8.0.tar.gz
-/mstflint-4.10.0.tar.gz
-/mstflint-4.11.0-2.tar.gz
-/mstflint-4.11.0-3.tar.gz
-/mstflint-4.11.0-4.tar.gz
-/mstflint-4.13.0-1.tar.gz
-/mstflint-4.13.1-1.tar.gz
-/mstflint-4.13.3-1.tar.gz
-/mstflint-4.13.3-2.tar.gz
-/mstflint-4.14.0-1.tar.gz
-/mstflint-4.14.0-3.tar.gz
-/mstflint-4.15.0-1.tar.gz
-/mstflint-4.16.0-1.tar.gz
-/mstflint-4.17.0-1.tar.gz
-/mstflint-4.18.0-1.tar.gz
-/mstflint-4.21.0-1.tar.gz
-/mstflint-4.23.0-1.tar.gz
-/mstflint-4.24.0-1.tar.gz
-/mstflint-4.25.0-1.tar.gz
-/mstflint-4.26.0-1.tar.gz
-/mstflint-4.29.0-1.tar.gz

SOURCES/add-default-link-flags-for-shared-libraries.patch

@@ -1,4 +1,4 @@
-From a91f8252d007aa0d8b2d211ea0061a60ad003c73 Mon Sep 17 00:00:00 2001
+From 0bf822388a194c01c82beb6b6529b49255a4bd39 Mon Sep 17 00:00:00 2001
 From: Kamal Heib <kheib@redhat.com>
 Date: Tue, 17 Oct 2023 14:19:52 -0400
 Subject: [PATCH] Add default link flags for shared libraries
@@ -12,56 +12,57 @@ Signed-off-by: Kamal Heib <kheib@redhat.com>
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/cmdif/Makefile.am b/cmdif/Makefile.am
-index 7bb332aada48..3ffdf7d6653e 100644
+index b6c43d59c8b5..0e03839459f2 100644
 --- a/cmdif/Makefile.am
 +++ b/cmdif/Makefile.am
-@@ -53,7 +53,7 @@ libcmdif_la_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.
+@@ -51,7 +51,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h
  cmdif_pylibdir = $(libdir)/mstflint/python_tools/
  cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py
- ${CCMDIF_SO}: libcmdif.la
+ ${CCMDIF_SO}: libcmdif.a
 -	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${CCMDIF_SO} \
 +	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${CCMDIF_SO} \
- 	$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
+ 	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul
  
  CLEANFILES = ${CCMDIF_SO}
 diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am
-index a5f66e9fd935..0d1417daa647 100644
+index 2283c2d1c763..ab8910dfc435 100644
 --- a/dev_mgt/Makefile.am
 +++ b/dev_mgt/Makefile.am
-@@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so
+@@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
  dist_dev_mgt_pylib_DATA = dev_mgt.py
  
- c_dev_mgt.so: libdev_mgt.la
+ c_dev_mgt.so: libdev_mgt.a
 -	$(CC) -g -Wall -pthread -shared ${CFLAGS} tools_dev_types.o -o c_dev_mgt.so \
 +	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} tools_dev_types.o -o c_dev_mgt.so \
- 	$(top_builddir)/reg_access/.libs/libreg_access.a \
+ 	-L$(USER_DIR)/reg_access -lreg_access \
- 	$(top_builddir)/tools_layouts/.libs/libtools_layouts.a \
+ 	-L$(USER_DIR)/tools_layouts -ltools_layouts \
- 	$(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
+ 	-L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul
 diff --git a/mtcr_py/Makefile.am b/mtcr_py/Makefile.am
-index 46fa4e60916d..2f431156a45e 100644
+index 934b8030a229..c8af0c2d5dac 100644
 --- a/mtcr_py/Makefile.am
 +++ b/mtcr_py/Makefile.am
-@@ -35,6 +35,6 @@ mtcr_pylibdir = $(libdir)/mstflint/python_tools/
+@@ -40,7 +40,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
- mtcr_pylib_DATA = cmtcr.so
+ mtcr_pylib_DATA = cmtcr.so mtcr.py
  dist_mtcr_pylib_DATA = mtcr.py
  cmtcr.so:
--	$(CC) -g -Wall -pthread -shared ${CFLAGS} -o cmtcr.so -Wl,--whole-archive $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a -Wl,--no-whole-archive
+-	$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
-+	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} -o cmtcr.so -Wl,--whole-archive $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a -Wl,--no-whole-archive
++	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
  
  CLEANFILES = cmtcr.so
+ 
 diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am
-index 8e38c473cc9c..6228b45af312 100644
+index c33bac653620..a231a6cd57e1 100644
 --- a/reg_access/Makefile.am
 +++ b/reg_access/Makefile.am
-@@ -57,7 +57,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO}
+@@ -56,7 +56,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py regaccess_structs.py
- dist_reg_access_pylib_DATA = regaccess.py regaccess_hca_ext_structs.py regaccess_switch_ext_structs.py
+ dist_reg_access_pylib_DATA = regaccess.py regaccess_structs.py
  
- ${RREG_ACCESS_SO}: libreg_access.la
+ ${RREG_ACCESS_SO}: libreg_access.a
 -	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \
 +	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${RREG_ACCESS_SO} \
- 	$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
+ 	-L$(USER_DIR)/tools_layouts -ltools_layouts -lmlxconfig_4th_gen_layouts -L$(MTCR_DIR) -lmtcr_ul
  
  CLEANFILES = ${RREG_ACCESS_SO}
 -- 
-2.44.0
+2.41.0
 

SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch

@@ -0,0 +1,26 @@
+diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
+index 420b82f..0a20bcd 100644
+--- a/flint/subcommands.cpp
++++ b/flint/subcommands.cpp
+@@ -4484,7 +4484,7 @@ FlintStatus SgSubCommand::sgFs2()
+     return FLINT_SUCCESS;
+ }
+ 
+-#define FW_RESET_MSG "To load new configuration run mlxfwreset or reboot machine"
++#define FW_RESET_MSG "To load new configuration run mstfwreset or reboot machine"
+ 
+ FlintStatus SgSubCommand::sgFs3()
+ {
+diff --git a/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h
+index f3edc43..a85e43d 100644
+--- a/mlxfwops/lib/flint_base.h
++++ b/mlxfwops/lib/flint_base.h
+@@ -364,7 +364,7 @@ struct GPH {
+ 
+ #define REBOOT_REQUIRED_STR "To load new FW run reboot machine."
+ #ifndef MST_UL
+-#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mlxfwreset or reboot machine."
++#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
+ #else
+ #define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
+ #endif

SPECS/mstflint.spec

@@ -2,7 +2,7 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.29.0
+Version:	4.25.0
 Release:	1%{?dist}
 License:	GPLv2+ or BSD
 Url:		https://github.com/Mellanox/%{name}
@@ -10,11 +10,11 @@ Source0: 	https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{
 Group:		Applications/System
 
 Patch4:	add-default-link-flags-for-shared-libraries.patch
+Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
 
 BuildRequires:	make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
 BuildRequires:  libcurl-devel, boost-devel, libxml2-devel, openssl-devel
-BuildRequires:  expat-devel
 %if %{__remake_config}
 BuildRequires:  libtool, autoconf, automake
 %endif
@@ -30,6 +30,7 @@ for network adapters based on Mellanox Technologies chips.
 %setup -q -n %{name}-%{version}
 
 %patch4 -p1
+%patch6 -p1
 
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
@@ -38,7 +39,7 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 %if %{__remake_config}
 ./autogen.sh
 %endif
-%configure --enable-fw-mgr --enable-adb-generic-tools
+%configure --enable-fw-mgr
 %make_build
 
 %install
@@ -51,138 +52,78 @@ find %{buildroot} -type f -name '*.a' -delete
 # Mark these shared libs executable for find-debuginfo.sh to find them.
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Debuginfo/
 chmod +x %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
-chmod +x %{buildroot}/%{_libdir}/mstflint/sdk/*.so
 
 %files
 %doc README
 %_bindir/*
 %{_sysconfdir}/mstflint
 %{_libdir}/mstflint
-%{_libdir}/libmtcr_ul.a
 
 %{_datadir}/mstflint
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 05 2024 Kamal Heib <kheib@redhat.com> - 4.29.0-1
+* Tue Oct 24 2023 Kamal Heib <kheib@redhat.com> - 4.25.0-1
-- Update to upstream release 4.29.0
-- Resolves: RHEL-52887
-
-* Mon Apr 29 2024 Kamal Heib <kheib@redhat.com> - 4.26.0-2
-- Fix debuginfo
-- Resolves: RHEL-34752
-
-* Fri Apr 26 2024 Kamal Heib <kheib@redhat.com> - 4.26.0-1
-- Update to upstream release 4.26.0
-- Resolves: RHEL-24470
-
-* Thu Oct 19 2023 Kamal Heib <kheib@redhat.com> - 4.25.0-1
 - Update to upstream release 4.25.0
-- Resolves: RHEL-886
+- Resolves: RHEL-931
-
-* Thu Jun 08 2023 Davide Cavalca <dcavalca@centosproject.org> - 4.24.0-2
-- Build the mstreg and mstlink tools
-- Resolves: rhbz#2213647
 
 * Fri Jun 02 2023 Kamal Heib <kheib@redhat.com> - 4.24.0-1
 - Update to upstream release 4.24.0
-- Resolves: rhbz#2170368
+- Add gating tests
+- Resolves: rhbz#2170069
 
-* Fri Feb 03 2023 Michal Schmidt <mschmidt@redhat.com> - 4.23.0-2
+* Wed Feb 08 2023 Michal Schmidt <mschmidt@redhat.com> - 4.23.0-2
-- Fix debuginfo generation.
-
-* Thu Feb 02 2023 Kamal Heib <kheib@redhat.com> - 4.23.0-1
 - Update to upstream release 4.23.0
+- Resolves: rhbz#2112936
 
-* Wed Aug 03 2022 Michal Schmidt <mschmidt@redhat.com> - 4.21.0-1
+* Wed Aug 17 2022 Michal Schmidt <mschmidt@redhat.com> - 4.21.0-1
 - Update to upstream release 4.21.0
+- Resolves: rhbz#2049525
+
+* Mon Mar 28 2022 Michal Schmidt <mschmidt@redhat.com> - 4.19.0-0.3
+- Rebase to the almost released 4.19.0
+- Resolves: rhbz#2045017
 
 * Sun Dec 05 2021 Honggang Li <honli@redhat.com> - 4.18.0-1
 - Rebase mstflint to latest upstream release v4.18.0-1
-- Resolves: rhbz#2029269
+- Resolves: rhbz#1982202
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.17.0-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
 
 * Thu Jul 01 2021 Honggang Li <honli@redhat.com> - 4.17.0-1
 - Rebase mstflint to latest upstream release v4.17.0-1
-- Resolves: rhbz#1858570
+- Resolves: bz1915313
 
-* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.16.0-3
+* Thu Nov 05 2020 Honggang Li <honli@redhat.com> - 4.15.0-1
-- Rebuilt for RHEL 9 BETA for openssl 3.0
+- Rebase to latest upstream release v4.15.0-1
-  Related: rhbz#1971065
+- Resolves: bz1851723
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.16.0-2
+* Thu Apr 16 2020 Honggang Li <honli@redhat.com> - 4.14.0-1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebase to latest upstream release v4.14.0-1
+- Resolves: bz1789386
 
-* Sun Jan 31 2021 Honggang Li <honli@redhat.com> - 4.16.0-1
+* Thu Jan 16 2020 Honggang Li <honli@redhat.com> - 4.13.3-2
-- Rebase mstflint to latest upstream release v4.16.0-1
+- Rebase to latest upstream release v4.13.3-2
+- Resolves: bz1788927
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.15.0-2
+* Wed Oct 30 2019 Honggang Li <honli@redhat.com> - 4.13.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Rebase to latest upstream release v4.13.1-1
+- Resolves: bz1722258
 
-* Wed Sep 16 2020 Honggang Li <honli@redhat.com> - 4.15.0-1
+* Thu Jun 13 2019 Honggang Li <honli@redhat.com> - 4.12.0-1
-- Rebase mstflint to latest upstream release v4.15.0-1
+- Rebase to latest upstream release v4.12.0-1
-
+- Resolves: bz1683083
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 13 2020 Tom Stellard <tstellar@redhat.com> - 4.14.0-4
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Mon Jun 22 2020 Honggang Li <honli@redhat.com> - 4.14.0-3
-- Rebase mstflint to latest upstream release v4.14.0-3
-
-* Sat May 30 2020 Jonathan Wakely <jwakely@redhat.com> - 4.14.0-2
-- Rebuilt for Boost 1.73
-
-* Tue Mar 31 2020 Honggang Li <honli@redhat.com> - 4.14.0-1
-- Rebase mstflint to latest upstream release v4.14.0-1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 07 2020 Honggang Li <honli@redhat.com> - 4.13.3-2
-- Rebase mstflint to latest upstream release v4.13.3-2
-
-* Sun Jan 05 2020 Honggang Li <honli@redhat.com> - 4.13.3-1
-- Rebase mstflint to latest upstream release v4.13.3-1
-
-* Thu Oct 17 2019 Honggang Li <honli@redhat.com> - 4.13.1-1
-- Rebase mstflint to latest upstream release v4.13.1-1
-
-* Wed Oct 02 2019 Honggang Li <honli@redhat.com> - 4.13.0-1
-- Rebase mstflint to latest upstream release v4.13.0-1
-- Resolves: bz1758011
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Apr 15 2019 Honggang Li <honli@redhat.com> - 4.11.0-5
-- Rebase mstflint to latest upstream release v4.11.0-4
-
-* Fri Feb 22 2019 Honggang Li <honli@redhat.com> - 4.11.0-4
-- Fix mstflint segment fault issue for ConnectX-5 HCA
-- Resolves: 1679844
-
-* Tue Feb 12 2019 Honggang Li <honli@redhat.com> - 4.11.0-3
-- Rebase mstflint to latest upstream release v4.11.0-3
-- Resolves: 1676338
 
 * Fri Feb  1 2019 Honggang Li <honli@redhat.com> - 4.11.0-2
-- Rebase mstflint to latest upstream release v4.11.0-2
+- Rebase to latest upstream release v4.11.0-2
-- Resolves: bz1671710
+- Resolves: bz1634777
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-4
+* Thu Sep 27 2018 Honggang Li <honli@redhat.com> - 4.10.0.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+- Fix annocheck issues
+- Resolves: bz1630599
 
-* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 4.10.0-3
+* Sun Aug 12 2018 Honggang Li <honli@redhat.com> - 4.10.0.2
-- Rebuilt for Boost 1.69
+- Rebase to latest upstream release v4.10.0-2
-
+- Fix license issue of mtcr_ul.c
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
+- Resolves: bz1541741
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Tue Jul 10 2018 Honggang Li <honli@redhat.com> - 4.10.0-1
 - Rebase to latest upstream release v4.10.0-1

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-        - rhel-9
-decision_context: osci_compose_gate
-rules:
-        - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -1 +0,0 @@
-SHA512 (mstflint-4.29.0-1.tar.gz) = 33e889feb97e86cfaf095a4224c63015363f38f595bf84b0c7d409359388b6c1fd1e36ab59f995b57ea0d9e3eb686c486bba8047b4cbe75a3829ca1b28ea3976

tests/run_tests.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# when running this in 1minutetip the PATH must be specified to execute
-# in the local directory.
-echo "Setting path to local directory"
-PATH=$PATH:$(pwd)
-
-# simple sanity test
-sanity.sh
-exit $?

tests/sanity.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# This is a simple sanity test to satisfy the RHEL8.1 onboard gating
-# requirement.
-
-ret=0
-cx2="ConnectX VPI PCIe 2.0"
-cx3="[ConnectX-3]"
-device_list=$(lspci | grep 'Mellanox' | grep -v 'Virtual' | grep -v 'DMA controller' | awk '{print $1}')
-
-# Skip loop if device list is empty
-[[ -z "${dev// }" ]] || for dev in "$device_list"; do
-    # View Device Info
-
-    lspci -vvv -s "$dev"
-    dev_name=$(lspci -s "$dev")
-
-    # Test Mstflint Tools
-
-    mstflint -d "$dev" q
-    let ret=$ret+$?
-
-    # mstconfig does not support < 4th Gen devices (e.g. ConnectX-2)
-    if [[ "$dev_name" != *"$cx2"* ]]; then
-        mstconfig -d "${dev}" q
-        let ret=$ret+$?
-    fi
-
-    mstvpd "$dev" 2>/dev/null
-    let ret=$ret+$?
-
-    mstregdump "$dev" >/dev/null
-    let ret=$ret+$?
-
-    # mstfwmanager/mstfwreset do not support ConnectX-2 or ConnectX-3
-    if [[ "$dev_name" != *"$cx2"* && "$dev_name" != *"$cx3"* ]]; then
-        mstfwmanager -d "$dev" --query
-        let ret=$ret+$?
-
-        mstfwreset -d "$dev" q
-        let ret=$ret+$?
-    fi
-done
-
-# end test - it is possible no Mellanox devices were available at all to test,
-# in which case we automatically mark the test PASS (exit 0)
-exit $ret

tests/tests.yml

@@ -1,12 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      tests:
-        - simple:
-            dir: .
-            run: ./run_tests.sh
-      required_packages:
-        - pciutils
-        - mstflint