From e822d0905a78b85fcdd79d9ea9dbbc7ffd1214a7 Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:10:59 +0100 Subject: fmc: Upgrade to lf-6.6.36-2.1.0 release Signed-off-by: Zelan Zou --- ...r-improve-parameter-definition-of-functio.patch | 56 ---------------------- .../openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | 5 +- 2 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch (limited to 'dynamic-layers') diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch deleted file mode 100644 index 5769d5552..000000000 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc/0001-FMCCFGReader-improve-parameter-definition-of-functio.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 018249d180705657efbecdce3736c9a415412762 Mon Sep 17 00:00:00 2001 -From: Meng Li -Date: Tue, 9 Jul 2024 14:35:06 +0800 -Subject: [PATCH] FMCCFGReader: improve parameter definition of function - errorFuncHandler - -When building fmc package, there is below error: -FMCCFGReader.cpp: In member function 'void CCFGReader::parseCfgData(std::string)': -FMCCFGReader.cpp:98:40: error: invalid conversion from -'void (*)(void*, xmlErrorPtr)' {aka 'void (*)(void*, _xmlError*)'} to -'xmlStructuredErrorFunc' {aka 'void (*)(void*, const _xmlError*)'} [-fpermissive] - 98 | xmlSetStructuredErrorFunc( &error, errorFuncHandler ); - | ^~~~~~~~~~~~~~~~ - | | - | void (*)(void*, xmlErrorPtr) {aka void (*)(void*, _xmlError*)} -Because in libxml2 package, the parameter definition of function -pointer xmlStructuredErrorFunc has changed, adjust the parameter -of errorFuncHandler to align with upstream. - -Upstream-Status: Pending - -Signed-off-by: Meng Li ---- - source/FMCGenericError.cpp | 2 +- - source/FMCGenericError.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/source/FMCGenericError.cpp b/source/FMCGenericError.cpp -index a1a87a4..c11742c 100644 ---- a/source/FMCGenericError.cpp -+++ b/source/FMCGenericError.cpp -@@ -33,7 +33,7 @@ - #include "FMCUtils.h" - #include "logger.hpp" - --void errorFuncHandler( void * ctx, xmlErrorPtr error ) -+void errorFuncHandler( void * ctx, const xmlError *error ) - { - char *filestr = (char*)""; - char *msgstr = (char*)""; -diff --git a/source/FMCGenericError.h b/source/FMCGenericError.h -index 504a81b..61ab6c1 100644 ---- a/source/FMCGenericError.h -+++ b/source/FMCGenericError.h -@@ -35,7 +35,7 @@ - - const int NO_LINE = -1; - --void errorFuncHandler( void * ctx, xmlErrorPtr error ); -+void errorFuncHandler( void * ctx, const xmlError *error ); - - - class CGenericError { --- -2.34.1 - diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 457a202c9..2219a6c04 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -7,10 +7,7 @@ PR = "r2" DEPENDS = "libxml2 fmlib tclap" SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" -SRC_URI:append = " \ - file://0001-FMCCFGReader-improve-parameter-definition-of-functio.patch \ -" -SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" +SRCREV = "5b9f4b16a864e9dfa58cdcc860be278a7f66ac18" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf