From c6be56206e2ce13019489e319ae5bce954a58921 Mon Sep 17 00:00:00 2001 From: chenmaodong Date: Thu, 29 Dec 2022 15:29:50 +0800 Subject: [PATCH] Fix error while burning mcc enabled Description Signed-off-by: chenmaodong --- ...-Fix-error-while-burning-mcc-enabled.patch | 33 +++++++++++++++++++ mstflint.spec | 9 +++-- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch diff --git a/backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch b/backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch new file mode 100644 index 0000000..46fe7f7 --- /dev/null +++ b/backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch @@ -0,0 +1,33 @@ +From e8d9ff786a04eb142ce6f3c8650ea975bbe595e2 Mon Sep 17 00:00:00 2001 +From: Samer Deeb +Date: Mon, 12 Nov 2018 20:39:36 +0000 +Subject: [PATCH] Title: Fix error while burning mcc enabled Description: + ignore HMAC calculation Issue: 1472385 + +Signed-off-by: Samer Deeb +--- + mlxfwops/lib/fs3_ops.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp +index deb4a05..b5a9d93 100644 +--- a/mlxfwops/lib/fs3_ops.cpp ++++ b/mlxfwops/lib/fs3_ops.cpp +@@ -3316,12 +3316,12 @@ bool Fs3Operations::AddHMACIfNeeded(Fs3Operations* imageOps, Flash *f) + } + } + +- return true; + #else + (void)imageOps; + (void)f; +- return errmsg("HMAC calculation is not implemented\n"); ++ //ignore + #endif ++ return true; + } + + bool Fs3Operations::DoAfterBurnJobs(const u_int32_t magic_patter[], +-- +2.21.0 + diff --git a/mstflint.spec b/mstflint.spec index c81c96d..72586d6 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -1,13 +1,13 @@ Name: mstflint Summary: Firmware Burning and Diagnostics Tools Version: 4.10.0 -Release: 8 +Release: 9 License: GPLv2+ or BSD Url: https://github.com/Mellanox/mstflint Source: https://github.com/Mellanox/%{name}/releases/download/v4.10.0-2/%{name}-%{version}.tar.gz Patch0000: 0001-Fix-compile-errors.patch Patch0001: fix-return-local-addr.patch - +Patch0002: backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch BuildRequires: libstdc++-devel zlib-devel rdma-core-devel gcc-c++ gcc BuildRequires: libcurl-devel boost-devel libxml2-devel openssl-devel Obsoletes: openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0 @@ -44,7 +44,10 @@ strip %{buildroot}/%{_libdir}/mstflint/python_tools/*.so %{_mandir}/man1/* %changelog -* Fri Sep 10 2021 Pengju Jiang +* Thu Dec 29 2022 chenmaodong - 4.10.0-9 +- Fix error while burning mcc enabled Description + +* Fri Sep 10 2021 Pengju Jiang - 4.10.0-8 - solve the strip problem of dark conversion compilation * Tue Aug 4 2021 shdluan@163.com - 4.10.0-7