.gitignore

@@ -1 +1 @@
-SOURCES/mstflint-4.24.0-1.tar.gz
+SOURCES/mstflint-4.26.0-1.tar.gz

.mstflint.metadata

@@ -1 +1 @@
-f7de4c5c9d3512d1167002106b5b48d274ee381d SOURCES/mstflint-4.24.0-1.tar.gz
+0ae1b90ef5c66a7d9e335b8bf4921ab20fd82f4a SOURCES/mstflint-4.26.0-1.tar.gz

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

@@ -1,52 +1,67 @@
+From a91f8252d007aa0d8b2d211ea0061a60ad003c73 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
+
+Signed-off-by: Kamal Heib <kheib@redhat.com>
+---
+ cmdif/Makefile.am      | 2 +-
+ dev_mgt/Makefile.am    | 2 +-
+ mtcr_py/Makefile.am    | 2 +-
+ reg_access/Makefile.am | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
 diff --git a/cmdif/Makefile.am b/cmdif/Makefile.am
-index 9807603..b23bcb9 100644
+index 7bb332aada48..3ffdf7d6653e 100644
 --- a/cmdif/Makefile.am
 +++ b/cmdif/Makefile.am
-@@ -51,7 +51,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h
+@@ -53,7 +53,7 @@ libcmdif_la_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.
  cmdif_pylibdir = $(libdir)/mstflint/python_tools/
  cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py
- ${CCMDIF_SO}: libcmdif.a
+ ${CCMDIF_SO}: libcmdif.la
 -	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${CCMDIF_SO} \
 +	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${CCMDIF_SO} \
- 	-L$(USER_DIR)/tools_layouts -ltools_layouts -L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul
+ 	$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
  
  CLEANFILES = ${CCMDIF_SO}
 diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am
-index 1fbd142..df5b14a 100644
+index a5f66e9fd935..0d1417daa647 100644
 --- a/dev_mgt/Makefile.am
 +++ b/dev_mgt/Makefile.am
-@@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
+@@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so
  dist_dev_mgt_pylib_DATA = dev_mgt.py
  
- c_dev_mgt.so: libdev_mgt.a
+ c_dev_mgt.so: libdev_mgt.la
 -	$(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 \
- 	-L$(USER_DIR)/reg_access -lreg_access \
- 	-L$(USER_DIR)/tools_layouts -ltools_layouts \
- 	-L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul
+ 	$(top_builddir)/reg_access/.libs/libreg_access.a \
+ 	$(top_builddir)/tools_layouts/.libs/libtools_layouts.a \
+ 	$(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
 diff --git a/mtcr_py/Makefile.am b/mtcr_py/Makefile.am
-index 934b803..c8af0c2 100644
+index 46fa4e60916d..2f431156a45e 100644
 --- a/mtcr_py/Makefile.am
 +++ b/mtcr_py/Makefile.am
-@@ -40,7 +40,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
- mtcr_pylib_DATA = cmtcr.so mtcr.py
+@@ -35,6 +35,6 @@ mtcr_pylibdir = $(libdir)/mstflint/python_tools/
+ mtcr_pylib_DATA = cmtcr.so
  dist_mtcr_pylib_DATA = mtcr.py
  cmtcr.so:
--	$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
-+	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
+-	$(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} ${LDFLAGS} -o cmtcr.so -Wl,--whole-archive $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a -Wl,--no-whole-archive
  
  CLEANFILES = cmtcr.so
- 
 diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am
-index 26f6a5a..9a42c37 100644
+index 8e38c473cc9c..6228b45af312 100644
 --- a/reg_access/Makefile.am
 +++ b/reg_access/Makefile.am
-@@ -53,7 +53,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py
- dist_reg_access_pylib_DATA = regaccess.py
+@@ -57,7 +57,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO}
+ dist_reg_access_pylib_DATA = regaccess.py regaccess_hca_ext_structs.py regaccess_switch_ext_structs.py
  
- ${RREG_ACCESS_SO}: libreg_access.a
+ ${RREG_ACCESS_SO}: libreg_access.la
 -	$(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \
 +	$(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${RREG_ACCESS_SO} \
-	-L$(USER_DIR)/tools_layouts -ltools_layouts -lmlxconfig_4th_gen_layouts -L$(MTCR_DIR) -lmtcr_ul
+ 	$(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a
  
  CLEANFILES = ${RREG_ACCESS_SO}
+-- 
+2.44.0
+

SPECS/mstflint.spec

@@ -2,8 +2,8 @@
 
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.24.0
-Release:	1%{?dist}
+Version:	4.26.0
+Release:	2%{?dist}
 License:	GPLv2+ or BSD
 Url:		https://github.com/Mellanox/%{name}
 Source0: 	https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.tar.gz
@@ -15,6 +15,7 @@ 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
@@ -39,7 +40,7 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 %if %{__remake_config}
 ./autogen.sh
 %endif
-%configure --enable-fw-mgr
+%configure --enable-fw-mgr --enable-adb-generic-tools
 %make_build
 
 %install
@@ -52,6 +53,7 @@ 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
@@ -63,10 +65,29 @@ chmod +x %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
 %{_mandir}/man1/*
 
 %changelog
+* 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
+
+* 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
 
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 4.23.0-2
+- Rebuilt for MSVSphere 9.2 beta
+
 * Fri Feb 03 2023 Michal Schmidt <mschmidt@redhat.com> - 4.23.0-2
 - Fix debuginfo generation.