Fix error while burning mcc enabled Description

Signed-off-by: chenmaodong <chenmaodong@xfusion.com>
This commit is contained in:
chenmaodong 2023-01-05 23:34:55 +08:00
parent bf3c40ad09
commit d9a41c54d8
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From e8d9ff786a04eb142ce6f3c8650ea975bbe595e2 Mon Sep 17 00:00:00 2001
From: Samer Deeb <samerd@mellanox.com>
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 <samerd@mellanox.com>
---
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

View File

@ -1,13 +1,14 @@
Name: mstflint Name: mstflint
Summary: Firmware Burning and Diagnostics Tools Summary: Firmware Burning and Diagnostics Tools
Version: 4.10.0 Version: 4.10.0
Release: 10 Release: 11
License: GPLv2+ or BSD License: GPLv2+ or BSD
Url: https://github.com/Mellanox/mstflint Url: https://github.com/Mellanox/mstflint
Source: https://github.com/Mellanox/%{name}/releases/download/v4.10.0-1/%{name}-%{version}.tar.gz Source: https://github.com/Mellanox/%{name}/releases/download/v4.10.0-1/%{name}-%{version}.tar.gz
Patch0000: 0001-Fix-compile-errors.patch Patch0000: 0001-Fix-compile-errors.patch
Patch0001: fix-return-local-addr.patch Patch0001: fix-return-local-addr.patch
Patch0002: mstflint-4.10.0-sw.patch Patch0002: mstflint-4.10.0-sw.patch
Patch0003: backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch
BuildRequires: libstdc++-devel zlib-devel rdma-core-devel gcc-c++ gcc BuildRequires: libstdc++-devel zlib-devel rdma-core-devel gcc-c++ gcc
BuildRequires: libcurl-devel boost-devel libxml2-devel openssl-devel BuildRequires: libcurl-devel boost-devel libxml2-devel openssl-devel
@ -27,6 +28,7 @@ code. Please see the file LICENSE for licensing details.
%ifarch sw_64 %ifarch sw_64
%patch2 -p1 %patch2 -p1
%endif %endif
%patch3 -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
@ -51,6 +53,9 @@ strip %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Thu Jan 05 2023 chenmaodong <chenmaodong@xfusion.com> - 4.10.0-11
- Fix error while burning mcc enabled Description
* Thu Dec 8 2022 liyanan <liyanan32@h-partners.com> - 4.10.0-10 * Thu Dec 8 2022 liyanan <liyanan32@h-partners.com> - 4.10.0-10
- fix strip problem - fix strip problem