From 89f0dc7db4f4229c7b121a332a9582383648f731 Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Thu, 30 Apr 2020 18:07:29 +0800 Subject: [PATCH 1/4] Add yaml file --- mstflint.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mstflint.yaml diff --git a/mstflint.yaml b/mstflint.yaml new file mode 100644 index 0000000..4407abb --- /dev/null +++ b/mstflint.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: Mellanox/mstflint +tag_prefix: ^v +seperator: . -- Gitee From 6351677127ab1c2790e03f7a8f79f3f8574364a1 Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Tue, 19 May 2020 19:53:45 +0800 Subject: [PATCH 2/4] Add patch 0001-Add-function-operator-for-class-ParserCallback --- ...on-operator-for-class-ParserCallback.patch | 52 +++++++++++++++++++ mstflint.spec | 6 ++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 0001-Add-function-operator-for-class-ParserCallback.patch diff --git a/0001-Add-function-operator-for-class-ParserCallback.patch b/0001-Add-function-operator-for-class-ParserCallback.patch new file mode 100644 index 0000000..fb824ab --- /dev/null +++ b/0001-Add-function-operator-for-class-ParserCallback.patch @@ -0,0 +1,52 @@ +From d8f728febf1ca43a3fa06926f2a5290daa3048a8 Mon Sep 17 00:00:00 2001 +From: lwx916518 +Date: Tue, 19 May 2020 19:26:39 +0800 +Subject: [PATCH] Add function operator= for class ParserCallback + +--- + ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++ + ext_libs/muparser/muParserCallback.h | 1 + + 2 files changed, 17 insertions(+) + +diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp +index 2044fe1..27c5b08 100755 +--- a/ext_libs/muparser/muParserCallback.cpp ++++ b/ext_libs/muparser/muParserCallback.cpp +@@ -386,6 +386,22 @@ namespace mu + m_eOprtAsct = ref.m_eOprtAsct; + } + ++ ParserCallback& ParserCallback::operator=(const ParserCallback& cb) ++ { ++ if (this != &cb) ++ { ++ m_pFun = cb.m_pFun; ++ m_iArgc = cb.m_iArgc; ++ m_bAllowOpti = cb.m_bAllowOpti; ++ m_iCode = cb.m_iCode; ++ m_iType = cb.m_iType; ++ m_iPri = cb.m_iPri; ++ m_eOprtAsct = cb.m_eOprtAsct; ++ } ++ ++ return *this; ++ } ++ + //--------------------------------------------------------------------------- + /** \brief Clone this instance and return a pointer to the new instance. */ + ParserCallback* ParserCallback::Clone() const +diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h +index ef32b49..e8e274d 100755 +--- a/ext_libs/muparser/muParserCallback.h ++++ b/ext_libs/muparser/muParserCallback.h +@@ -81,6 +81,7 @@ public: + ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti); + ParserCallback(); + ParserCallback(const ParserCallback &a_Fun); ++ ParserCallback& operator=(const ParserCallback& cb); + + ParserCallback* Clone() const; + +-- +2.23.0 + diff --git a/mstflint.spec b/mstflint.spec index 779f0f7..a8afbdd 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -1,10 +1,11 @@ Name: mstflint Summary: Firmware Burning and Diagnostics Tools Version: 4.10.0 -Release: 4 +Release: 5 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-Add-function-operator-for-class-ParserCallback.patch BuildRequires: libstdc++-devel zlib-devel libibmad-devel gcc-c++ gcc BuildRequires: libcurl-devel boost-devel libxml2-devel openssl-devel @@ -42,5 +43,8 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{_mandir}/man1/* %changelog +* Tue May 19 2020 lizhenhua - 4.10.0-5 +- Add function operator= for class ParserCallback + * Wed Dec 11 2019 catastrowings - 4.10.0-4 - openEuler init -- Gitee From 50af9e36033b2743ac3b48b3d24e62c2159d03fd Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Wed, 20 May 2020 10:59:40 +0800 Subject: [PATCH 3/4] Fix compile errors --- ...ack.patch => 0001-Fix-compile-errors.patch | 35 ++++++++++++++++--- mstflint.spec | 6 ++-- 2 files changed, 33 insertions(+), 8 deletions(-) rename 0001-Add-function-operator-for-class-ParserCallback.patch => 0001-Fix-compile-errors.patch (41%) diff --git a/0001-Add-function-operator-for-class-ParserCallback.patch b/0001-Fix-compile-errors.patch similarity index 41% rename from 0001-Add-function-operator-for-class-ParserCallback.patch rename to 0001-Fix-compile-errors.patch index fb824ab..828a88e 100644 --- a/0001-Add-function-operator-for-class-ParserCallback.patch +++ b/0001-Fix-compile-errors.patch @@ -1,12 +1,13 @@ -From d8f728febf1ca43a3fa06926f2a5290daa3048a8 Mon Sep 17 00:00:00 2001 -From: lwx916518 -Date: Tue, 19 May 2020 19:26:39 +0800 -Subject: [PATCH] Add function operator= for class ParserCallback +From cb320df0e85dfc65ef605c8fcca0c16dd5c70420 Mon Sep 17 00:00:00 2001 +From: lizhenhua +Date: Wed, 20 May 2020 10:45:53 +0800 +Subject: [PATCH] Fix compile errors --- ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++ ext_libs/muparser/muParserCallback.h | 1 + - 2 files changed, 17 insertions(+) + mlxfwops/lib/fw_ops.cpp | 6 +++--- + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp index 2044fe1..27c5b08 100755 @@ -47,6 +48,30 @@ index ef32b49..e8e274d 100755 ParserCallback* Clone() const; +diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp +index fc06c50..4d7bcdf 100644 +--- a/mlxfwops/lib/fw_ops.cpp ++++ b/mlxfwops/lib/fw_ops.cpp +@@ -768,16 +768,16 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams) + _fwParams.errBuff = (char*)NULL; + _fwParams.errBuffSize = 0; + _fwParams.fileHndl = (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ? \ +- 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 + _fwParams.flashParams = (flash_params_t*)NULL; + _fwParams.forceLock = fwParams.forceLock; + _fwParams.ignoreCacheRep = fwParams.ignoreCacheRep; + _fwParams.mstHndl = (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ? \ +- 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.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 ? (char*)memmove((new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL; + _fwParams.readOnly = fwParams.readOnly; + _fwParams.shortErrors = fwParams.shortErrors; + _fwParams.uefiExtra = fwParams.uefiExtra; -- 2.23.0 diff --git a/mstflint.spec b/mstflint.spec index a8afbdd..dd42139 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -5,7 +5,7 @@ Release: 5 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-Add-function-operator-for-class-ParserCallback.patch +Patch0000: 0001-Fix-compile-errors.patch BuildRequires: libstdc++-devel zlib-devel libibmad-devel gcc-c++ gcc BuildRequires: libcurl-devel boost-devel libxml2-devel openssl-devel @@ -23,7 +23,7 @@ code. Please see the file LICENSE for licensing details. %build export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" -%configure --enable-fw-mgr +%configure --enable-fw-mgr --disable-inband %make_build %install @@ -44,7 +44,7 @@ export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %changelog * Tue May 19 2020 lizhenhua - 4.10.0-5 -- Add function operator= for class ParserCallback +- Fix compile errors for gcc9 * Wed Dec 11 2019 catastrowings - 4.10.0-4 - openEuler init -- Gitee From c921d1aae40ceb78eb863aab904e2362b98eeace Mon Sep 17 00:00:00 2001 From: lizhenhua Date: Wed, 20 May 2020 11:06:01 +0800 Subject: [PATCH 4/4] Fix compile errors --- mstflint.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mstflint.spec b/mstflint.spec index dd42139..8c4b269 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -23,7 +23,7 @@ code. Please see the file LICENSE for licensing details. %build export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" -%configure --enable-fw-mgr --disable-inband +%configure --enable-fw-mgr %make_build %install -- Gitee