From 72d3c276506dc912df9b49a3f1538c2002aa88b4 Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:08:49 +0100 Subject: [PATCH 1/6] management-complex: Bump version 10.37.0 -> 10.39.0 Signed-off-by: Zelan Zou --- ...ment-complex_10.37.0.bb => management-complex_10.39.0.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename recipes-dpaa2/management-complex/{management-complex_10.37.0.bb => management-complex_10.39.0.bb} (85%) diff --git a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb similarity index 85% rename from recipes-dpaa2/management-complex/management-complex_10.37.0.bb rename to recipes-dpaa2/management-complex/management-complex_10.39.0.bb index d18771590..5097e71f2 100644 --- a/recipes-dpaa2/management-complex/management-complex_10.37.0.bb +++ b/recipes-dpaa2/management-complex/management-complex_10.39.0.bb @@ -1,17 +1,18 @@ SUMMARY = "DPAA2 Management Complex Firmware" LICENSE = "NXP-Binary-EULA" -LIC_FILES_CHKSUM = "file://LICENSE;md5=481d6288552113961a835bbabceb0c33" +LIC_FILES_CHKSUM = "file://LICENSE;md5=0701845051a61f6012009d7d6d11b32b" inherit deploy INHIBIT_DEFAULT_DEPS = "1" SRC_URI = "git://github.com/nxp/qoriq-mc-binary;protocol=https;nobranch=1" -SRCREV = "bb19f586b87b97878b4bd0d3e57da2ca40c5c69f" +SRCREV = "7d82686272f8a60b803818bbc7c5396819ee3b06" S = "${WORKDIR}/git" REGLEX:ls2088a = "ls2088a" +REGLEX:ls2080a = "ls2080a" REGLEX:ls1088a = "ls1088a" REGLEX:lx2160a = "lx216xa" REGLEX:lx2162a = "lx216xa" From e822d0905a78b85fcdd79d9ea9dbbc7ffd1214a7 Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:10:59 +0100 Subject: [PATCH 2/6] fmc: Upgrade to lf-6.6.36-2.1.0 release Signed-off-by: Zelan Zou --- ...rove-parameter-definition-of-functio.patch | 56 ------------------- .../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 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" From 84a83e0177d86435708b983e647435ec0eddd2c0 Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:13:03 +0100 Subject: [PATCH 3/6] gpp-aioptool_git.bb: Update license to BSD-3-Clause Signed-off-by: Zelan Zou --- recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb index 303aa8ff6..befc769ef 100644 --- a/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb +++ b/recipes-dpaa2/gpp-aioptool/gpp-aioptool_git.bb @@ -3,8 +3,8 @@ on an AIOP Tile using MC interfaces. This application enables the user to \ fetch status of tile, load a valid ELF file and run it on a tile and get and set \ time of day." SECTION = "dpaa2" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=386a6287daa6504b7e7e5014ddfb3987" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" SRC_URI = "git://github.com/nxp-qoriq/gpp-aioptool;protocol=https;nobranch=1 \ file://0001-remove-libio.h.patch \ From 056dfa194d13490774f73bba3dd333a0b72ff69b Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:13:56 +0100 Subject: [PATCH 4/6] restool: Upgrade to lf-6.6.36-2.1.0 release Signed-off-by: Zelan Zou --- recipes-dpaa2/restool/restool_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-dpaa2/restool/restool_git.bb b/recipes-dpaa2/restool/restool_git.bb index 1d1aeffe2..bbf7fec25 100644 --- a/recipes-dpaa2/restool/restool_git.bb +++ b/recipes-dpaa2/restool/restool_git.bb @@ -1,11 +1,11 @@ SUMMARY = "DPAA2 Resource Manager Tool" LICENSE = "BSD-3-Clause | GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=ec8d84e9cd4de287e290275d09db27f0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=83af78c71766dd5fb1c1c3dd64a75ee7" SRC_URI = "git://github.com/nxp-qoriq/restool;protocol=https;nobranch=1 \ file://disable-manpage-generation.patch \ " -SRCREV = "46604e41f4c7e54efa62503c6b4629321b21e056" +SRCREV = "d9fbfc68018c8dbe33bdf236dc6b4c02f15aa6e1" S = "${WORKDIR}/git" From b238f632ba531a6a509cddb01649848bd9239941 Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:14:43 +0100 Subject: [PATCH 5/6] spc: Upgrade to lf-6.6.36-2.1.0 release Signed-off-by: Zelan Zou --- recipes-dpaa2/spc/spc_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-dpaa2/spc/spc_git.bb b/recipes-dpaa2/spc/spc_git.bb index 2c695368e..c54484be3 100644 --- a/recipes-dpaa2/spc/spc_git.bb +++ b/recipes-dpaa2/spc/spc_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=163b09a1c249a6ff2b28da1ceca2e0a8" DEPENDS = "libxml2 fmlib tclap" SRC_URI = "git://github.com/nxp-qoriq/spc;protocol=https;nobranch=1" -SRCREV = "d624b7809be48e4cf29a7bfa201028e4de1d1955" +SRCREV = "b8d69580e5c6aeeb9f1354ee2faed6e0134eaef4" S = "${WORKDIR}/git" From 6d5c966c2ce578ed90a4e22d7378572fc74f4c40 Mon Sep 17 00:00:00 2001 From: Zelan Zou Date: Tue, 5 Nov 2024 03:15:21 +0100 Subject: [PATCH 6/6] uefi: Upgrade to lf-6.6.36-2.1.0 release Signed-off-by: Zelan Zou --- recipes-bsp/uefi/uefi_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/uefi/uefi_git.bb b/recipes-bsp/uefi/uefi_git.bb index b001a325c..268b5b1d9 100644 --- a/recipes-bsp/uefi/uefi_git.bb +++ b/recipes-bsp/uefi/uefi_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://NXP-Binary-EULA;md5=343ec8f06efc37467a6de53686fa6315" inherit deploy SRC_URI = "git://github.com/NXP/qoriq-uefi-binary.git;nobranch=1;protocol=https" -SRCREV = "15deb924ff063007592ee647602dd454353f5aee" +SRCREV = "55789d536850e00c6f2284fb28eaf21712cd276b" S = "${WORKDIR}/git"