diff --git a/.gitignore b/.gitignore index 96ebfc0..29a8270 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ noarch/ /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 diff --git a/mstflint.spec b/mstflint.spec index 495913e..aeabdc4 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -2,15 +2,14 @@ Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.26.0 -Release: 2%{?dist} +Version: 4.29.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 @@ -31,7 +30,6 @@ 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 '{}' ';' @@ -60,11 +58,16 @@ chmod +x %{buildroot}/%{_libdir}/mstflint/sdk/*.so %_bindir/* %{_sysconfdir}/mstflint %{_libdir}/mstflint +%{_libdir}/libmtcr_ul.a %{_datadir}/mstflint %{_mandir}/man1/* %changelog +* 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 diff --git a/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch b/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch deleted file mode 100644 index d24ef01..0000000 --- a/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/sources b/sources index 8d29fd2..7ff7d14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mstflint-4.26.0-1.tar.gz) = 6ba357f5ed3a8c5ac4195b7b45c5abad3eb95d549f5bd2cc8ae84dee7dab894c47839a3ce3aec04bdaa4942ca953bb148a68cf72c2e9d4e60e090595c96c163e +SHA512 (mstflint-4.29.0-1.tar.gz) = 33e889feb97e86cfaf095a4224c63015363f38f595bf84b0c7d409359388b6c1fd1e36ab59f995b57ea0d9e3eb686c486bba8047b4cbe75a3829ca1b28ea3976