From 33392460e7f3d088d70d4f9b7fe7528f91c23132 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Mar 2025 07:49:23 +0000 Subject: [PATCH] import CS mstflint-4.30.0-1.el9 --- .gitignore | 2 +- .mstflint.metadata | 2 +- ...-with-mstfwreset-in-mstflint-message.patch | 26 ------------------- SPECS/mstflint.spec | 19 +++++++++----- 4 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch diff --git a/.gitignore b/.gitignore index fbd0020..63cf946 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mstflint-4.26.0-1.tar.gz +SOURCES/mstflint-4.30.0-1.tar.gz diff --git a/.mstflint.metadata b/.mstflint.metadata index 8a120e8..4fd7561 100644 --- a/.mstflint.metadata +++ b/.mstflint.metadata @@ -1 +1 @@ -0ae1b90ef5c66a7d9e335b8bf4921ab20fd82f4a SOURCES/mstflint-4.26.0-1.tar.gz +9e7596c709156b4cda0f2e78fcdce64eda6be7c8 SOURCES/mstflint-4.30.0-1.tar.gz diff --git a/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch b/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch deleted file mode 100644 index d24ef01..0000000 --- a/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec index 495913e..04d2579 100644 --- a/SPECS/mstflint.spec +++ b/SPECS/mstflint.spec @@ -2,15 +2,14 @@ Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.26.0 -Release: 2%{?dist} +Version: 4.30.0 +Release: 1%{?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 Group: Applications/System -Patch4: add-default-link-flags-for-shared-libraries.patch -Patch6: replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch +Patch4: add-default-link-flags-for-shared-libraries.patch BuildRequires: make BuildRequires: libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc @@ -30,8 +29,7 @@ for network adapters based on Mellanox Technologies chips. %prep %setup -q -n %{name}-%{version} -%patch4 -p1 -%patch6 -p1 +%patch 4 -p1 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' @@ -60,11 +58,20 @@ chmod +x %{buildroot}/%{_libdir}/mstflint/sdk/*.so %_bindir/* %{_sysconfdir}/mstflint %{_libdir}/mstflint +%{_libdir}/libmtcr_ul.a %{_datadir}/mstflint %{_mandir}/man1/* %changelog +* Tue Dec 10 2024 Kamal Heib - 4.30.0-1 +- Update to upstream release 4.30.0 +- Resolves: RHEL-67034 + +* Tue Nov 05 2024 Kamal Heib - 4.29.0-1 +- Update to upstream release 4.29.0 +- Resolves: RHEL-52887 + * Mon Apr 29 2024 Kamal Heib - 4.26.0-2 - Fix debuginfo - Resolves: RHEL-34752