From cbe9ad9dabaf4e2aa72864a2a17ea55a864043b3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 27 Nov 2024 09:45:52 +0300 Subject: [PATCH] import mstflint-4.30.0-1.el10 --- .gitignore | 2 +- .mstflint.metadata | 2 +- ...-with-mstfwreset-in-mstflint-message.patch | 26 ------------------- SPECS/mstflint.spec | 10 ++++--- 4 files changed, 8 insertions(+), 32 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 5459084..45de9b0 100644 --- a/SPECS/mstflint.spec +++ b/SPECS/mstflint.spec @@ -2,7 +2,7 @@ ## (rpmautospec version 0.6.5) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 7; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} @@ -12,7 +12,7 @@ Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.26.0 +Version: 4.30.0 Release: %autorelease # COPYING says the license is your choice of OpenIB.org BSD or GPLv2. # kernel/Makefile has the 3-clause BSD. @@ -25,7 +25,6 @@ Group: Applications/System Patch1: 0001-Fix-bind-now-test.patch 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 @@ -47,7 +46,6 @@ for network adapters based on Mellanox Technologies chips. %patch1 -p1 %patch4 -p1 -%patch6 -p1 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' @@ -75,12 +73,16 @@ chmod +x %{buildroot}/%{_libdir}/mstflint/sdk/*.so %doc README %_bindir/* %{_libdir}/mstflint +%{_libdir}/libmtcr_ul.a %{_datadir}/mstflint %{_mandir}/man1/* %changelog ## START: Generated by rpmautospec +* Mon Nov 18 2024 Kamal Heib - 4.30.0-1 +- Update to upstream release 4.30.0 + * Tue Oct 29 2024 Troy Dawson - 4.26.0-7 - Bump release for October 2024 mass rebuild: