| Message ID | 20251007174858.87288-1-skandigraun@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-networking] libiec61850: upgrade 1.5.3 -> 1.6.1 | expand |
seeing failures on qemux86 https://errors.yoctoproject.org/Errors/Details/884900/ qemuarm https://errors.yoctoproject.org/Errors/Details/884889/ I think it is related to target being 32bit. On Tue, Oct 7, 2025 at 10:49 AM Gyorgy Sarvari via lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org> wrote: > > This update contains a fix for CVE-2024-26529, CVE-2024-45970 and CVE-2024-45971 > > Changelog: https://github.com/mz-automation/libiec61850/blob/v1.6/CHANGELOG > > Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> > --- > ...MAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 24 +++++++----- > ...-break-CMAKE_INSTALL_PATH-by-trying-.patch | 39 ------------------- > ...iec61850_1.5.3.bb => libiec61850_1.6.1.bb} | 10 ++--- > 3 files changed, 20 insertions(+), 53 deletions(-) > delete mode 100644 meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch > rename meta-networking/recipes-connectivity/libiec61850/{libiec61850_1.5.3.bb => libiec61850_1.6.1.bb} (77%) > > diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch > index e778e8158b..a33a6248a7 100644 > --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch > +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch > @@ -7,7 +7,7 @@ Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in > This ensures that it gets installed in platform specified system libdir > all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 > > -Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] > +Upstream-Status: Denied [https://github.com/mz-automation/libiec61850/pull/376 - closed without a word] > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > pyiec61850/CMakeLists.txt | 6 ++++-- > @@ -15,15 +15,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> > > --- a/pyiec61850/CMakeLists.txt > +++ b/pyiec61850/CMakeLists.txt > -@@ -31,7 +31,9 @@ endif() > +@@ -31,14 +31,9 @@ swig_add_library(pyiec61850 > > - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) > + swig_link_libraries(pyiec61850 ${LIBS}) > > --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > --install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > +-# Finding python modules install path > +-execute_process( > +- COMMAND ${Python_EXECUTABLE} -c > +- "from sysconfig import get_path; import sys; sys.stdout.write(get_path('platlib'))" > +- OUTPUT_VARIABLE PYTHON_SITE_DIR > +-) > +include(GNUInstallDirs) > -+ > -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > -+install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > > - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) > +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${PYTHON_SITE_DIR}) > +-install(TARGETS pyiec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) > ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) > ++install(TARGETS pyiec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) > + > + add_test(test_pyiec61850 ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) > diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch > deleted file mode 100644 > index 3f0490cb80..0000000000 > --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 > -From: Romain Naour <romain.naour@smile.fr> > -Date: Fri, 10 Jul 2020 17:08:34 +0200 > -Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find > - python modules install path (site-packages) > - > -https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake > - > -Signed-off-by: Romain Naour <romain.naour@smile.fr> > ---- > -Upstream-Status: Pending > - > - pyiec61850/CMakeLists.txt | 11 ++--------- > - 1 file changed, 2 insertions(+), 9 deletions(-) > - > -diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt > -index 159ef4b..d1732a1 100644 > ---- a/pyiec61850/CMakeLists.txt > -+++ b/pyiec61850/CMakeLists.txt > -@@ -31,14 +31,7 @@ endif() > - > - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) > - > --# Finding python modules install path > --execute_process( > -- COMMAND ${PYTHON_EXECUTABLE} -c > -- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" > -- OUTPUT_VARIABLE PYTHON_SITE_DIR > --) > -- > --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) > --install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) > -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > -+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > - > - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) > --- > -2.31.1 > - > diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb > similarity index 77% > rename from meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb > rename to meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb > index cfded66e41..eb9ab9b4fe 100644 > --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb > +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb > @@ -13,10 +13,9 @@ SECTION = "console/network" > LICENSE = "GPL-3.0-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > DEPENDS = "swig-native python3" > -SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" > +SRCREV = "a13961110b8238d2d8ea577c1fb7592ba3017ad8" > > -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ > - file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ > +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.6;protocol=https;tag=v${PV} \ > file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ > " > > @@ -26,12 +25,13 @@ inherit cmake pkgconfig python3-dir python3native siteinfo > EXTRA_OECMAKE = " \ > -DBUILD_EXAMPLES=OFF \ > -DBUILD_PYTHON_BINDINGS=ON \ > + -DPYTHON_BASEVERSION=${PYTHON_BASEVERSION} \ > " > > RDEPENDS:${PN}-python = " python3-core " > RDEPENDS:${PN} = " python3-core " > > FILES:${PN} += " \ > - ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ > - ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ > + ${PYTHON_SITEPACKAGES_DIR}/pyiec61850.py \ > + ${PYTHON_SITEPACKAGES_DIR}/_pyiec61850.so \ > " > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#120342): https://lists.openembedded.org/g/openembedded-devel/message/120342 > Mute This Topic: https://lists.openembedded.org/mt/115640790/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 10/8/25 17:53, Khem Raj wrote: > seeing failures on qemux86 > > https://errors.yoctoproject.org/Errors/Details/884900/ > > qemuarm > > https://errors.yoctoproject.org/Errors/Details/884889/ > > I think it is related to target being 32bit. Right, the cmake's findPython returns python from ${RECIPE_SYSROOT_NATIVE} instead of ${RECIPE_SYSROOT}... will look if I can solve it more elegantly than just patching the include path to the correct one. > > On Tue, Oct 7, 2025 at 10:49 AM Gyorgy Sarvari via > lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org> > wrote: >> This update contains a fix for CVE-2024-26529, CVE-2024-45970 and CVE-2024-45971 >> >> Changelog: https://github.com/mz-automation/libiec61850/blob/v1.6/CHANGELOG >> >> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> >> --- >> ...MAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 24 +++++++----- >> ...-break-CMAKE_INSTALL_PATH-by-trying-.patch | 39 ------------------- >> ...iec61850_1.5.3.bb => libiec61850_1.6.1.bb} | 10 ++--- >> 3 files changed, 20 insertions(+), 53 deletions(-) >> delete mode 100644 meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch >> rename meta-networking/recipes-connectivity/libiec61850/{libiec61850_1.5.3.bb => libiec61850_1.6.1.bb} (77%) >> >> diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch >> index e778e8158b..a33a6248a7 100644 >> --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch >> +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch >> @@ -7,7 +7,7 @@ Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in >> This ensures that it gets installed in platform specified system libdir >> all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 >> >> -Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] >> +Upstream-Status: Denied [https://github.com/mz-automation/libiec61850/pull/376 - closed without a word] >> Signed-off-by: Khem Raj <raj.khem@gmail.com> >> --- >> pyiec61850/CMakeLists.txt | 6 ++++-- >> @@ -15,15 +15,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> >> >> --- a/pyiec61850/CMakeLists.txt >> +++ b/pyiec61850/CMakeLists.txt >> -@@ -31,7 +31,9 @@ endif() >> +@@ -31,14 +31,9 @@ swig_add_library(pyiec61850 >> >> - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) >> + swig_link_libraries(pyiec61850 ${LIBS}) >> >> --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >> --install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >> +-# Finding python modules install path >> +-execute_process( >> +- COMMAND ${Python_EXECUTABLE} -c >> +- "from sysconfig import get_path; import sys; sys.stdout.write(get_path('platlib'))" >> +- OUTPUT_VARIABLE PYTHON_SITE_DIR >> +-) >> +include(GNUInstallDirs) >> -+ >> -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >> -+install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >> >> - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) >> +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${PYTHON_SITE_DIR}) >> +-install(TARGETS pyiec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) >> ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) >> ++install(TARGETS pyiec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) >> + >> + add_test(test_pyiec61850 ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) >> diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch >> deleted file mode 100644 >> index 3f0490cb80..0000000000 >> --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch >> +++ /dev/null >> @@ -1,39 +0,0 @@ >> -From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 >> -From: Romain Naour <romain.naour@smile.fr> >> -Date: Fri, 10 Jul 2020 17:08:34 +0200 >> -Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find >> - python modules install path (site-packages) >> - >> -https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake >> - >> -Signed-off-by: Romain Naour <romain.naour@smile.fr> >> ---- >> -Upstream-Status: Pending >> - >> - pyiec61850/CMakeLists.txt | 11 ++--------- >> - 1 file changed, 2 insertions(+), 9 deletions(-) >> - >> -diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt >> -index 159ef4b..d1732a1 100644 >> ---- a/pyiec61850/CMakeLists.txt >> -+++ b/pyiec61850/CMakeLists.txt >> -@@ -31,14 +31,7 @@ endif() >> - >> - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) >> - >> --# Finding python modules install path >> --execute_process( >> -- COMMAND ${PYTHON_EXECUTABLE} -c >> -- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" >> -- OUTPUT_VARIABLE PYTHON_SITE_DIR >> --) >> -- >> --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) >> --install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) >> -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >> -+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >> - >> - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) >> --- >> -2.31.1 >> - >> diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb >> similarity index 77% >> rename from meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb >> rename to meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb >> index cfded66e41..eb9ab9b4fe 100644 >> --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb >> +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb >> @@ -13,10 +13,9 @@ SECTION = "console/network" >> LICENSE = "GPL-3.0-only" >> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" >> DEPENDS = "swig-native python3" >> -SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" >> +SRCREV = "a13961110b8238d2d8ea577c1fb7592ba3017ad8" >> >> -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ >> - file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ >> +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.6;protocol=https;tag=v${PV} \ >> file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ >> " >> >> @@ -26,12 +25,13 @@ inherit cmake pkgconfig python3-dir python3native siteinfo >> EXTRA_OECMAKE = " \ >> -DBUILD_EXAMPLES=OFF \ >> -DBUILD_PYTHON_BINDINGS=ON \ >> + -DPYTHON_BASEVERSION=${PYTHON_BASEVERSION} \ >> " >> >> RDEPENDS:${PN}-python = " python3-core " >> RDEPENDS:${PN} = " python3-core " >> >> FILES:${PN} += " \ >> - ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ >> - ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ >> + ${PYTHON_SITEPACKAGES_DIR}/pyiec61850.py \ >> + ${PYTHON_SITEPACKAGES_DIR}/_pyiec61850.so \ >> " >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#120342): https://lists.openembedded.org/g/openembedded-devel/message/120342 >> Mute This Topic: https://lists.openembedded.org/mt/115640790/1997914 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >>
On Wed, Oct 8, 2025 at 11:48 AM Gyorgy Sarvari <skandigraun@gmail.com> wrote: > > On 10/8/25 17:53, Khem Raj wrote: > > seeing failures on qemux86 > > > > https://errors.yoctoproject.org/Errors/Details/884900/ > > > > qemuarm > > > > https://errors.yoctoproject.org/Errors/Details/884889/ > > > > I think it is related to target being 32bit. > > Right, the cmake's findPython returns python from > ${RECIPE_SYSROOT_NATIVE} instead of ${RECIPE_SYSROOT}... will look if I > can solve it more elegantly than just patching the include path to the > correct one. adding inherit python3targetconfig might be all you need here. > > > > > On Tue, Oct 7, 2025 at 10:49 AM Gyorgy Sarvari via > > lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org> > > wrote: > >> This update contains a fix for CVE-2024-26529, CVE-2024-45970 and CVE-2024-45971 > >> > >> Changelog: https://github.com/mz-automation/libiec61850/blob/v1.6/CHANGELOG > >> > >> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> > >> --- > >> ...MAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 24 +++++++----- > >> ...-break-CMAKE_INSTALL_PATH-by-trying-.patch | 39 ------------------- > >> ...iec61850_1.5.3.bb => libiec61850_1.6.1.bb} | 10 ++--- > >> 3 files changed, 20 insertions(+), 53 deletions(-) > >> delete mode 100644 meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch > >> rename meta-networking/recipes-connectivity/libiec61850/{libiec61850_1.5.3.bb => libiec61850_1.6.1.bb} (77%) > >> > >> diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch > >> index e778e8158b..a33a6248a7 100644 > >> --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch > >> +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch > >> @@ -7,7 +7,7 @@ Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in > >> This ensures that it gets installed in platform specified system libdir > >> all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 > >> > >> -Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] > >> +Upstream-Status: Denied [https://github.com/mz-automation/libiec61850/pull/376 - closed without a word] > >> Signed-off-by: Khem Raj <raj.khem@gmail.com> > >> --- > >> pyiec61850/CMakeLists.txt | 6 ++++-- > >> @@ -15,15 +15,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> > >> > >> --- a/pyiec61850/CMakeLists.txt > >> +++ b/pyiec61850/CMakeLists.txt > >> -@@ -31,7 +31,9 @@ endif() > >> +@@ -31,14 +31,9 @@ swig_add_library(pyiec61850 > >> > >> - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) > >> + swig_link_libraries(pyiec61850 ${LIBS}) > >> > >> --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > >> --install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > >> +-# Finding python modules install path > >> +-execute_process( > >> +- COMMAND ${Python_EXECUTABLE} -c > >> +- "from sysconfig import get_path; import sys; sys.stdout.write(get_path('platlib'))" > >> +- OUTPUT_VARIABLE PYTHON_SITE_DIR > >> +-) > >> +include(GNUInstallDirs) > >> -+ > >> -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > >> -+install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > >> > >> - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) > >> +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${PYTHON_SITE_DIR}) > >> +-install(TARGETS pyiec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) > >> ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) > >> ++install(TARGETS pyiec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) > >> + > >> + add_test(test_pyiec61850 ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) > >> diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch > >> deleted file mode 100644 > >> index 3f0490cb80..0000000000 > >> --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch > >> +++ /dev/null > >> @@ -1,39 +0,0 @@ > >> -From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 > >> -From: Romain Naour <romain.naour@smile.fr> > >> -Date: Fri, 10 Jul 2020 17:08:34 +0200 > >> -Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find > >> - python modules install path (site-packages) > >> - > >> -https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake > >> - > >> -Signed-off-by: Romain Naour <romain.naour@smile.fr> > >> ---- > >> -Upstream-Status: Pending > >> - > >> - pyiec61850/CMakeLists.txt | 11 ++--------- > >> - 1 file changed, 2 insertions(+), 9 deletions(-) > >> - > >> -diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt > >> -index 159ef4b..d1732a1 100644 > >> ---- a/pyiec61850/CMakeLists.txt > >> -+++ b/pyiec61850/CMakeLists.txt > >> -@@ -31,14 +31,7 @@ endif() > >> - > >> - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) > >> - > >> --# Finding python modules install path > >> --execute_process( > >> -- COMMAND ${PYTHON_EXECUTABLE} -c > >> -- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" > >> -- OUTPUT_VARIABLE PYTHON_SITE_DIR > >> --) > >> -- > >> --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) > >> --install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) > >> -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > >> -+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) > >> - > >> - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) > >> --- > >> -2.31.1 > >> - > >> diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb > >> similarity index 77% > >> rename from meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb > >> rename to meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb > >> index cfded66e41..eb9ab9b4fe 100644 > >> --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb > >> +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb > >> @@ -13,10 +13,9 @@ SECTION = "console/network" > >> LICENSE = "GPL-3.0-only" > >> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > >> DEPENDS = "swig-native python3" > >> -SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" > >> +SRCREV = "a13961110b8238d2d8ea577c1fb7592ba3017ad8" > >> > >> -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ > >> - file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ > >> +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.6;protocol=https;tag=v${PV} \ > >> file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ > >> " > >> > >> @@ -26,12 +25,13 @@ inherit cmake pkgconfig python3-dir python3native siteinfo > >> EXTRA_OECMAKE = " \ > >> -DBUILD_EXAMPLES=OFF \ > >> -DBUILD_PYTHON_BINDINGS=ON \ > >> + -DPYTHON_BASEVERSION=${PYTHON_BASEVERSION} \ > >> " > >> > >> RDEPENDS:${PN}-python = " python3-core " > >> RDEPENDS:${PN} = " python3-core " > >> > >> FILES:${PN} += " \ > >> - ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ > >> - ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ > >> + ${PYTHON_SITEPACKAGES_DIR}/pyiec61850.py \ > >> + ${PYTHON_SITEPACKAGES_DIR}/_pyiec61850.so \ > >> " > >> > >> -=-=-=-=-=-=-=-=-=-=-=- > >> Links: You receive all messages sent to this group. > >> View/Reply Online (#120342): https://lists.openembedded.org/g/openembedded-devel/message/120342 > >> Mute This Topic: https://lists.openembedded.org/mt/115640790/1997914 > >> Group Owner: openembedded-devel+owner@lists.openembedded.org > >> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > >> -=-=-=-=-=-=-=-=-=-=-=- > >> >
On 10/8/25 21:25, Khem Raj wrote: > On Wed, Oct 8, 2025 at 11:48 AM Gyorgy Sarvari <skandigraun@gmail.com> wrote: >> On 10/8/25 17:53, Khem Raj wrote: >>> seeing failures on qemux86 >>> >>> https://errors.yoctoproject.org/Errors/Details/884900/ >>> >>> qemuarm >>> >>> https://errors.yoctoproject.org/Errors/Details/884889/ >>> >>> I think it is related to target being 32bit. >> Right, the cmake's findPython returns python from >> ${RECIPE_SYSROOT_NATIVE} instead of ${RECIPE_SYSROOT}... will look if I >> can solve it more elegantly than just patching the include path to the >> correct one. > > adding > > inherit python3targetconfig > > might be all you need here. Indeed, you seem to be right - thank you. v2 will land soon. >>> On Tue, Oct 7, 2025 at 10:49 AM Gyorgy Sarvari via >>> lists.openembedded.org <skandigraun=gmail.com@lists.openembedded.org> >>> wrote: >>>> This update contains a fix for CVE-2024-26529, CVE-2024-45970 and CVE-2024-45971 >>>> >>>> Changelog: https://github.com/mz-automation/libiec61850/blob/v1.6/CHANGELOG >>>> >>>> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> >>>> --- >>>> ...MAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 24 +++++++----- >>>> ...-break-CMAKE_INSTALL_PATH-by-trying-.patch | 39 ------------------- >>>> ...iec61850_1.5.3.bb => libiec61850_1.6.1.bb} | 10 ++--- >>>> 3 files changed, 20 insertions(+), 53 deletions(-) >>>> delete mode 100644 meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch >>>> rename meta-networking/recipes-connectivity/libiec61850/{libiec61850_1.5.3.bb => libiec61850_1.6.1.bb} (77%) >>>> >>>> diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch >>>> index e778e8158b..a33a6248a7 100644 >>>> --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch >>>> +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch >>>> @@ -7,7 +7,7 @@ Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in >>>> This ensures that it gets installed in platform specified system libdir >>>> all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 >>>> >>>> -Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] >>>> +Upstream-Status: Denied [https://github.com/mz-automation/libiec61850/pull/376 - closed without a word] >>>> Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>> --- >>>> pyiec61850/CMakeLists.txt | 6 ++++-- >>>> @@ -15,15 +15,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>> >>>> --- a/pyiec61850/CMakeLists.txt >>>> +++ b/pyiec61850/CMakeLists.txt >>>> -@@ -31,7 +31,9 @@ endif() >>>> +@@ -31,14 +31,9 @@ swig_add_library(pyiec61850 >>>> >>>> - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) >>>> + swig_link_libraries(pyiec61850 ${LIBS}) >>>> >>>> --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >>>> --install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >>>> +-# Finding python modules install path >>>> +-execute_process( >>>> +- COMMAND ${Python_EXECUTABLE} -c >>>> +- "from sysconfig import get_path; import sys; sys.stdout.write(get_path('platlib'))" >>>> +- OUTPUT_VARIABLE PYTHON_SITE_DIR >>>> +-) >>>> +include(GNUInstallDirs) >>>> -+ >>>> -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >>>> -+install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >>>> >>>> - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) >>>> +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${PYTHON_SITE_DIR}) >>>> +-install(TARGETS pyiec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) >>>> ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) >>>> ++install(TARGETS pyiec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) >>>> + >>>> + add_test(test_pyiec61850 ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) >>>> diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch >>>> deleted file mode 100644 >>>> index 3f0490cb80..0000000000 >>>> --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch >>>> +++ /dev/null >>>> @@ -1,39 +0,0 @@ >>>> -From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 >>>> -From: Romain Naour <romain.naour@smile.fr> >>>> -Date: Fri, 10 Jul 2020 17:08:34 +0200 >>>> -Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find >>>> - python modules install path (site-packages) >>>> - >>>> -https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake >>>> - >>>> -Signed-off-by: Romain Naour <romain.naour@smile.fr> >>>> ---- >>>> -Upstream-Status: Pending >>>> - >>>> - pyiec61850/CMakeLists.txt | 11 ++--------- >>>> - 1 file changed, 2 insertions(+), 9 deletions(-) >>>> - >>>> -diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt >>>> -index 159ef4b..d1732a1 100644 >>>> ---- a/pyiec61850/CMakeLists.txt >>>> -+++ b/pyiec61850/CMakeLists.txt >>>> -@@ -31,14 +31,7 @@ endif() >>>> - >>>> - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) >>>> - >>>> --# Finding python modules install path >>>> --execute_process( >>>> -- COMMAND ${PYTHON_EXECUTABLE} -c >>>> -- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" >>>> -- OUTPUT_VARIABLE PYTHON_SITE_DIR >>>> --) >>>> -- >>>> --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) >>>> --install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) >>>> -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >>>> -+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) >>>> - >>>> - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) >>>> --- >>>> -2.31.1 >>>> - >>>> diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb >>>> similarity index 77% >>>> rename from meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb >>>> rename to meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb >>>> index cfded66e41..eb9ab9b4fe 100644 >>>> --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb >>>> +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb >>>> @@ -13,10 +13,9 @@ SECTION = "console/network" >>>> LICENSE = "GPL-3.0-only" >>>> LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" >>>> DEPENDS = "swig-native python3" >>>> -SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" >>>> +SRCREV = "a13961110b8238d2d8ea577c1fb7592ba3017ad8" >>>> >>>> -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ >>>> - file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ >>>> +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.6;protocol=https;tag=v${PV} \ >>>> file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ >>>> " >>>> >>>> @@ -26,12 +25,13 @@ inherit cmake pkgconfig python3-dir python3native siteinfo >>>> EXTRA_OECMAKE = " \ >>>> -DBUILD_EXAMPLES=OFF \ >>>> -DBUILD_PYTHON_BINDINGS=ON \ >>>> + -DPYTHON_BASEVERSION=${PYTHON_BASEVERSION} \ >>>> " >>>> >>>> RDEPENDS:${PN}-python = " python3-core " >>>> RDEPENDS:${PN} = " python3-core " >>>> >>>> FILES:${PN} += " \ >>>> - ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ >>>> - ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ >>>> + ${PYTHON_SITEPACKAGES_DIR}/pyiec61850.py \ >>>> + ${PYTHON_SITEPACKAGES_DIR}/_pyiec61850.so \ >>>> " >>>> >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>> Links: You receive all messages sent to this group. >>>> View/Reply Online (#120342): https://lists.openembedded.org/g/openembedded-devel/message/120342 >>>> Mute This Topic: https://lists.openembedded.org/mt/115640790/1997914 >>>> Group Owner: openembedded-devel+owner@lists.openembedded.org >>>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] >>>> -=-=-=-=-=-=-=-=-=-=-=- >>>>
diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch index e778e8158b..a33a6248a7 100644 --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch +++ b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch @@ -7,7 +7,7 @@ Subject: [PATCH] pyiec61850: Use CMAKE_INSTALL_LIBDIR from GNUInstallDirs in This ensures that it gets installed in platform specified system libdir all platforms do not use /usr/lib as assumed here e.g. ppc64 uses lib64 -Upstream-Status: Submitted [https://github.com/mz-automation/libiec61850/pull/376] +Upstream-Status: Denied [https://github.com/mz-automation/libiec61850/pull/376 - closed without a word] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- pyiec61850/CMakeLists.txt | 6 ++++-- @@ -15,15 +15,21 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/pyiec61850/CMakeLists.txt +++ b/pyiec61850/CMakeLists.txt -@@ -31,7 +31,9 @@ endif() +@@ -31,14 +31,9 @@ swig_add_library(pyiec61850 - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) + swig_link_libraries(pyiec61850 ${LIBS}) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) --install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) +-# Finding python modules install path +-execute_process( +- COMMAND ${Python_EXECUTABLE} -c +- "from sysconfig import get_path; import sys; sys.stdout.write(get_path('platlib'))" +- OUTPUT_VARIABLE PYTHON_SITE_DIR +-) +include(GNUInstallDirs) -+ -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) -+install(TARGETS _iec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}//python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${PYTHON_SITE_DIR}) +-install(TARGETS pyiec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyiec61850.py DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) ++install(TARGETS pyiec61850 LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/python${PYTHON_BASEVERSION}/site-packages) + + add_test(test_pyiec61850 ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) diff --git a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch b/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch deleted file mode 100644 index 3f0490cb80..0000000000 --- a/meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001 -From: Romain Naour <romain.naour@smile.fr> -Date: Fri, 10 Jul 2020 17:08:34 +0200 -Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find - python modules install path (site-packages) - -https://stackoverflow.com/questions/1242904/finding-python-site-packages-directory-with-cmake - -Signed-off-by: Romain Naour <romain.naour@smile.fr> ---- -Upstream-Status: Pending - - pyiec61850/CMakeLists.txt | 11 ++--------- - 1 file changed, 2 insertions(+), 9 deletions(-) - -diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt -index 159ef4b..d1732a1 100644 ---- a/pyiec61850/CMakeLists.txt -+++ b/pyiec61850/CMakeLists.txt -@@ -31,14 +31,7 @@ endif() - - swig_link_libraries(iec61850 ${PYTHON_LIBRARIES} ${LIBS}) - --# Finding python modules install path --execute_process( -- COMMAND ${PYTHON_EXECUTABLE} -c -- "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib())" -- OUTPUT_VARIABLE PYTHON_SITE_DIR --) -- --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) --install(TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) -+install(TARGETS _iec61850 LIBRARY DESTINATION /usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) - - add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py) --- -2.31.1 - diff --git a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb similarity index 77% rename from meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb rename to meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb index cfded66e41..eb9ab9b4fe 100644 --- a/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.5.3.bb +++ b/meta-networking/recipes-connectivity/libiec61850/libiec61850_1.6.1.bb @@ -13,10 +13,9 @@ SECTION = "console/network" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "swig-native python3" -SRCREV = "6f557c490f0b46ab5d7ef1b01bb3bc9fab3f442f" +SRCREV = "a13961110b8238d2d8ea577c1fb7592ba3017ad8" -SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5;protocol=https \ - file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \ +SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.6;protocol=https;tag=v${PV} \ file://0001-pyiec61850-Use-CMAKE_INSTALL_LIBDIR-from-GNUInstallD.patch \ " @@ -26,12 +25,13 @@ inherit cmake pkgconfig python3-dir python3native siteinfo EXTRA_OECMAKE = " \ -DBUILD_EXAMPLES=OFF \ -DBUILD_PYTHON_BINDINGS=ON \ + -DPYTHON_BASEVERSION=${PYTHON_BASEVERSION} \ " RDEPENDS:${PN}-python = " python3-core " RDEPENDS:${PN} = " python3-core " FILES:${PN} += " \ - ${PYTHON_SITEPACKAGES_DIR}/iec61850.py \ - ${PYTHON_SITEPACKAGES_DIR}/_iec61850.so \ + ${PYTHON_SITEPACKAGES_DIR}/pyiec61850.py \ + ${PYTHON_SITEPACKAGES_DIR}/_pyiec61850.so \ "
This update contains a fix for CVE-2024-26529, CVE-2024-45970 and CVE-2024-45971 Changelog: https://github.com/mz-automation/libiec61850/blob/v1.6/CHANGELOG Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> --- ...MAKE_INSTALL_LIBDIR-from-GNUInstallD.patch | 24 +++++++----- ...-break-CMAKE_INSTALL_PATH-by-trying-.patch | 39 ------------------- ...iec61850_1.5.3.bb => libiec61850_1.6.1.bb} | 10 ++--- 3 files changed, 20 insertions(+), 53 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/libiec61850/files/0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch rename meta-networking/recipes-connectivity/libiec61850/{libiec61850_1.5.3.bb => libiec61850_1.6.1.bb} (77%)