packages/mstflint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!39 Update to 4.25.0

Browse Source 
From: @wu-leilei 
Reviewed-by: @wang--ge 
Signed-off-by: @wang--ge
This commit is contained in:
openeuler-ci-bot 2023-10-10 06:57:04 +00:00 committed by Gitee
commit 612fdd22f0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
9 changed files with 65 additions and 1363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
0001-Fix-compile-errors.patch
View File

@ -1,4 +1,4 @@
From a6ab27b854a63983403ee4376a0303629267c6c1 Mon Sep 17 00:00:00 2001 From 8dad60feacfc28d092a0de066eba4e2a41dfe616 Mon Sep 17 00:00:00 2001
From: lizhenhua <lizhenhua@sina.com> From: lizhenhua <lizhenhua@sina.com>
Date: Wed, 20 May 2020 13:49:21 +0800 Date: Wed, 20 May 2020 13:49:21 +0800
Subject: [PATCH] Fix compile errors Subject: [PATCH] Fix compile errors
@ -6,88 +6,93 @@ Subject: [PATCH] Fix compile errors
--- ---
ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++ ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++
ext_libs/muparser/muParserCallback.h | 1 + ext_libs/muparser/muParserCallback.h | 1 +
mlxfwops/lib/fw_ops.cpp | 6 +++--- mlxfwops/lib/fw_ops.cpp | 10 +++-------
small_utils/mtserver.c | 4 ++-- small_utils/mtserver.c | 4 ++--
4 files changed, 22 insertions(+), 5 deletions(-) 4 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp
index 2044fe1..27c5b08 100755 index 8db3c1d..2040efe 100644
--- a/ext_libs/muparser/muParserCallback.cpp --- a/ext_libs/muparser/muParserCallback.cpp
+++ b/ext_libs/muparser/muParserCallback.cpp +++ b/ext_libs/muparser/muParserCallback.cpp
@@ -386,6 +386,22 @@ namespace mu @@ -392,6 +392,22 @@ ParserCallback::ParserCallback(const ParserCallback& ref)
m_eOprtAsct = ref.m_eOprtAsct; m_eOprtAsct = ref.m_eOprtAsct;
} }
+ ParserCallback& ParserCallback::operator=(const ParserCallback& cb) +ParserCallback& ParserCallback::operator=(const ParserCallback& cb)
+ { +{
+ if (this != &cb) + if (this != &cb)
+ { + {
+ m_pFun = cb.m_pFun; + m_pFun = cb.m_pFun;
+ m_iArgc = cb.m_iArgc; + m_iArgc = cb.m_iArgc;
+ m_bAllowOpti = cb.m_bAllowOpti; + m_bAllowOpti = cb.m_bAllowOpti;
+ m_iCode = cb.m_iCode; + m_iCode = cb.m_iCode;
+ m_iType = cb.m_iType; + m_iType = cb.m_iType;
+ m_iPri = cb.m_iPri; + m_iPri = cb.m_iPri;
+ m_eOprtAsct = cb.m_eOprtAsct; + m_eOprtAsct = cb.m_eOprtAsct;
+ } + }
+ +
+ return *this; + return *this;
+ } +}
+ +
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
/** \brief Clone this instance and return a pointer to the new instance. */ /** \brief Clone this instance and return a pointer to the new instance. */
ParserCallback* ParserCallback::Clone() const ParserCallback* ParserCallback::Clone() const
diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h
index ef32b49..e8e274d 100755 index d756099..913e059 100644
--- a/ext_libs/muparser/muParserCallback.h --- a/ext_libs/muparser/muParserCallback.h
+++ b/ext_libs/muparser/muParserCallback.h +++ b/ext_libs/muparser/muParserCallback.h
@@ -81,6 +81,7 @@ public: @@ -80,6 +80,7 @@ public:
ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti); ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti);
ParserCallback(); ParserCallback();
ParserCallback(const ParserCallback &a_Fun); ParserCallback(const ParserCallback& a_Fun);
+ ParserCallback& operator=(const ParserCallback& cb); + ParserCallback& operator=(const ParserCallback& cb);
ParserCallback* Clone() const; ParserCallback* Clone() const;
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index fc06c50..4d7bcdf 100644 index ea3ca19..d26d6c7 100644
--- a/mlxfwops/lib/fw_ops.cpp --- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp +++ b/mlxfwops/lib/fw_ops.cpp
@@ -768,16 +768,16 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams) @@ -879,21 +879,17 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams)
_fwParams.errBuff = (char*)NULL;
_fwParams.errBuffSize = 0; _fwParams.errBuffSize = 0;
_fwParams.fileHndl = (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ? \ _fwParams.fileHndl =
- strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL; (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ?
+ (char*)memmove((new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL; - strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) :
- (char*)NULL;
+ (char*)memmove((new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL;
// no support for flash params // no support for flash params
_fwParams.flashParams = (flash_params_t*)NULL; _fwParams.flashParams = (flash_params_t*)NULL;
_fwParams.forceLock = fwParams.forceLock; _fwParams.forceLock = fwParams.forceLock;
_fwParams.ignoreCacheRep = fwParams.ignoreCacheRep; _fwParams.ignoreCacheRep = fwParams.ignoreCacheRep;
_fwParams.mstHndl = (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ? \ _fwParams.mstHndl =
- strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL; (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ?
+ (char*)memmove((new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL; - strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) :
- (char*)NULL;
+ (char*)memmove((new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL;
_fwParams.noFlashVerify = fwParams.noFlashVerify; _fwParams.noFlashVerify = fwParams.noFlashVerify;
_fwParams.numOfBanks = fwParams.numOfBanks; _fwParams.numOfBanks = fwParams.numOfBanks;
- _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL; - _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid,
- strlen(fwParams.psid) + 1) :
- (char*)NULL;
+ _fwParams.psid = fwParams.psid ? (char*)memmove((new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL; + _fwParams.psid = fwParams.psid ? (char*)memmove((new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL;
_fwParams.readOnly = fwParams.readOnly; _fwParams.readOnly = fwParams.readOnly;
_fwParams.shortErrors = fwParams.shortErrors; _fwParams.shortErrors = fwParams.shortErrors;
_fwParams.uefiExtra = fwParams.uefiExtra; _fwParams.uefiExtra = fwParams.uefiExtra;
diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
index 143c1f4..335a5ff 100644 index d75ec2e..8026ce5 100644
--- a/small_utils/mtserver.c --- a/small_utils/mtserver.c
+++ b/small_utils/mtserver.c +++ b/small_utils/mtserver.c
@@ -420,8 +420,8 @@ int parse_i2c_cmd(char *buf, u_int8_t *addr_width, u_int8_t *slave_addr, int *si @@ -714,8 +714,8 @@ int parse_i2c_cmd(char* buf,
for (i = 0; i < *size; i++) { {
char tmp_num[10]; char tmp_num[10];
// TODO: use 16 on the strtoul // TODO: use 16 on the strtoul
- strncpy(tmp_num, "0x", 2); - strncpy(tmp_num, "0x", 3);
- strncpy(tmp_num + 2, p, 2); - strncpy(tmp_num + 2, p, 2);
+ memmove(tmp_num, "0x", 2); + memmove(tmp_num, "0x", 3);
+ memmove(tmp_num + 2, p, 2); + memmove(tmp_num + 2, p, 2);
tmp_num[4] = '\0'; tmp_num[4] = '\0';
((u_int8_t*)data)[i] = (u_int8_t)strtoul(tmp_num, 0, 0); ((u_int8_t*)data)[i] = (u_int8_t)strtoul(tmp_num, 0, 0);
p += 2; p += 2;
-- --
2.23.0 2.27.0

43
0002-fix-build-failure-due-to-gcc-updated.patch
View File

@ -1,43 +0,0 @@
From a0776ec857a40991f8ff82e49d9e9a0302848038 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Tue, 4 Jul 2023 15:02:53 +0800
Subject: [PATCH] fix build failure due to gcc updated
---
ext_libs/sqlite/sqlite3.c | 6 +++++-
mlxfwupdate/server_request.cpp | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ext_libs/sqlite/sqlite3.c b/ext_libs/sqlite/sqlite3.c
index e198678..e244656 100755
--- a/ext_libs/sqlite/sqlite3.c
+++ b/ext_libs/sqlite/sqlite3.c
@@ -100249,7 +100249,11 @@ SQLITE_PRIVATE void sqlite3DefaultRowEst(Index *pIdx){
** number of rows in the table. Or 10, if the estimated number of rows
** in the table is less than that. */
a[0] = pIdx->pTable->nRowLogEst;
- if( a[0]<33 ) a[0] = 33; assert( 33==sqlite3LogEst(10) );
+ if( a[0]<33 ) {
+ a[0] = 33;
+ }
+
+ assert( 33==sqlite3LogEst(10) );
/* Estimate that a[1] is 10, a[2] is 9, a[3] is 8, a[4] is 7, a[5] is
** 6 and each subsequent value (if any) is 5. */
diff --git a/mlxfwupdate/server_request.cpp b/mlxfwupdate/server_request.cpp
index a33559a..46a19fa 100644
--- a/mlxfwupdate/server_request.cpp
+++ b/mlxfwupdate/server_request.cpp
@@ -482,7 +482,7 @@ int ServerRequest::curl_request(const char *url,
// Internal CURL progressmeter must be disabled if we provide our own callback
curl_easy_setopt(_curl, CURLOPT_NOPROGRESS, false);
// Install the callback function
- curl_easy_setopt(_curl, CURLOPT_PROGRESSFUNCTION, progress_func);
+ curl_easy_setopt(_curl, CURLOPT_XFERINFOFUNCTION, progress_func);
}
if (_Proxy.size() > 0) {
curl_easy_setopt(_curl, CURLOPT_PROXY, _Proxy.c_str());
--
2.33.0

80
0005-Allow-building-on-riscv64.patch
View File

@ -1,80 +0,0 @@
From 889235fee41dc9b565407ce923e5af100c839b97 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <nvidia@cohens.org.il>
Date: Fri, 5 Feb 2021 10:36:33 +0200
Subject: [PATCH] Allow building on riscv64
---
common/compatibility.h | 4 +++-
mtcr_ul/packets_common.h | 4 +++-
tools_layouts/adb_to_c_utils.h | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/common/compatibility.h b/common/compatibility.h
index f8bc817..d163478 100644
--- a/common/compatibility.h
+++ b/common/compatibility.h
@@ -63,6 +63,8 @@
# define ARCH_arm64
# elif defined(__arm__)
# define ARCH_arm6l
+# elif defined(__riscv)
+# define ARCH_riscv
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -109,7 +111,7 @@
# define U48H_FMT "0x%012llx"
# define U64D_FMT_GEN "llu"
# endif
-#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
+#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
# define U64D_FMT "%lu"
# define U64H_FMT "0x%016lx"
# define U48H_FMT "0x%012lx"
diff --git a/mtcr_ul/packets_common.h b/mtcr_ul/packets_common.h
index 4df05ef..7f43b59 100644
--- a/mtcr_ul/packets_common.h
+++ b/mtcr_ul/packets_common.h
@@ -152,6 +152,8 @@
# define ARCH_arm64
# elif defined(__arm__)
# define ARCH_arm6l
+# elif defined(__riscv)
+# define ARCH_riscv
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -165,7 +167,7 @@
/* define macros for print fields */
//#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)
/*
- #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__))
+ #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_riscv))
# define U64H_FMT "0x%016lx"
# define U64D_FMT "%lu"
# define U32H_FMT "0x%08x"
diff --git a/tools_layouts/adb_to_c_utils.h b/tools_layouts/adb_to_c_utils.h
index 2e7a1ef..61af52f 100644
--- a/tools_layouts/adb_to_c_utils.h
+++ b/tools_layouts/adb_to_c_utils.h
@@ -140,6 +140,8 @@ extern "C" {
# define ARCH_arm64
# elif defined(__arm__)
# define ARCH_arm6l
+# elif defined(__riscv)
+# define ARCH_riscv
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -183,7 +185,7 @@ extern "C" {
# define U64H_FMT "0x%016llx"
# define U48H_FMT "0x%012llx"
# endif
-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
+#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
# define U64D_FMT "%lu"
# define U64H_FMT "0x%016lx"
# define U48H_FMT "0x%012lx"
--
2.40.1

33
backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch
View File

@ -1,33 +0,0 @@
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

1146
backport-0001-Title-Fix-errors-found-with-checkpatch-script.patch
View File

File diff suppressed because it is too large Load Diff

20
fix-return-local-addr.patch
View File

@ -1,12 +1,12 @@
diff -urN ./ext_libs2/sqlite/sqlite3.c ./ext_libs/sqlite/sqlite3.c diff -Nur a/ext_libs/sqlite/sqlite3.c b/ext_libs/sqlite/sqlite3.c
--- ./ext_libs2/sqlite/sqlite3.c 2021-08-05 09:37:16.410250283 +0800 --- a/ext_libs/sqlite/sqlite3.c 2023-10-09 17:31:40.829134845 +0800
+++ ./ext_libs/sqlite/sqlite3.c 2021-08-05 09:36:24.801803014 +0800 +++ b/ext_libs/sqlite/sqlite3.c 2023-10-09 17:32:35.753931035 +0800
@@ -112969,7 +112969,7 @@ @@ -134302,7 +134302,7 @@
Expr *pLimit, /* LIMIT value. NULL means not used */ u32 selFlags, /* Flag parameters, such as SF_Distinct */
Expr *pOffset /* OFFSET value. NULL means no offset */ Expr *pLimit /* LIMIT value. NULL means not used */
){ ){
- Select *pNew; - Select *pNew, *pAllocated;
+ static Select *pNew; + static Select *pNew, *pAllocated;
Select standin; Select standin;
sqlite3 *db = pParse->db; pAllocated = pNew = sqlite3DbMallocRawNN(pParse->db, sizeof(*pNew) );
pNew = sqlite3DbMallocRawNN(db, sizeof(*pNew) ); if( pNew==0 ){

BIN
mstflint-4.10.0.tar.gz
View File

Binary file not shown.

BIN
mstflint-4.25.0-1.tar.gz Normal file
View File

Binary file not shown.

13
mstflint.spec
View File

@ -1,16 +1,12 @@
Name: mstflint Name: mstflint
Summary: Firmware Burning and Diagnostics Tools Summary: Firmware Burning and Diagnostics Tools
Version: 4.10.0 Version: 4.25.0
Release: 12 Release: 1
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-2/%{name}-%{version}.tar.gz Source: https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.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: backport-0001-Title-Fix-error-while-burning-mcc-enabled.patch
Patch0003: backport-0001-Title-Fix-errors-found-with-checkpatch-script.patch
Patch0004: 0002-fix-build-failure-due-to-gcc-updated.patch
Patch0005: 0005-Allow-building-on-riscv64.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
Obsoletes: openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0 Obsoletes: openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0
@ -47,6 +43,9 @@ strip %{buildroot}/%{_libdir}/mstflint/python_tools/*.so
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Mon Oct 09 2023 wulei <wu_lei@hoperun.com> - 4.25.0-1
- Update to 4.25.0
* Wed Jul 19 2023 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 4.10.0-12 * Wed Jul 19 2023 lvxiaoqian <xiaoqian@nj.iscas.ac.cn> - 4.10.0-12
- Add riscv patch from v4.17 - Add riscv patch from v4.17