288 files changed, 5040 insertions, 3181 deletions

diff --git a/meta-oe/recipes-extended/7zip/7zip_24.09.bb b/meta-oe/recipes-extended/7zip/7zip_24.09.bb
new file mode 100644
index 0000000000..74e44c44e3
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/7zip_24.09.bb
@@ -0,0 +1,76 @@
+SUMMARY = "7-zip is a commandline utility handling 7z archives."
+HOMEPAGE = "http://www.7-zip.org/"
+LICENSE = "LGPL-2.1-or-later & unRAR & PD & BSD-2-Clause & BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \
+                    file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \
+                    file://DOC/License.txt;md5=44483e232b64ffca25fe001f3d6418d0"
+
+CVE_PRODUCT = "7-zip 7zip"
+SRC_URI = "git://github.com/ip7z/7zip.git;protocol=https;branch=main \
+           file://0001-support-yocto-cross-compiling.patch \
+           file://7z_wrapper.sh \
+           "
+SRCREV = "e5431fa6f5505e385c6f9367260717e9c47dc2ee"
+
+UPSTREAM_CHECK_URI = "https://github.com/ip7z/7zip/releases/latest"
+
+
+# Support Yocto cross compiling
+CXXFLAGS:append:toolchain-clang = " -Wno-error=cast-qual -Wno-error=sign-conversion \
+                                    -Wno-error=disabled-macro-expansion \
+                                    -Wno-error=shorten-64-to-32 \
+                                    -Wno-error=cast-function-type-strict"
+
+EXTRA_OEMAKE += " \
+    CXXFLAGS_EXTRA='${CXXFLAGS}' \
+    CFLAGS_BASE2='${CFLAGS}' \
+    LDFLAGS_STATIC_3='${LDFLAGS}' \
+"
+
+# Support clang
+MAKEFILE ?= "../../cmpl_gcc.mak"
+MAKEFILE:class-target:toolchain-clang = "../../cmpl_clang.mak"
+
+do_compile() {
+    oe_runmake -C CPP/7zip/Bundles/Alone2    -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/Format7zF -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/UI/Console        -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/SFXCon    -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/Alone     -f ${MAKEFILE}
+    oe_runmake -C CPP/7zip/Bundles/Alone7z   -f ${MAKEFILE}
+}
+
+FILES:${PN} += "${libdir}/*"
+
+FILES_SOLIBSDEV = ""
+INSANE_SKIP:${PN} += "dev-so"
+
+INSTALLDIR ?= "g"
+INSTALLDIR:class-target:toolchain-clang = "c"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/CPP/7zip/Bundles/Alone/b/${INSTALLDIR}/7za ${D}${bindir}
+        install -m 0755 ${S}/CPP/7zip/Bundles/Alone7z/b/${INSTALLDIR}/7zr ${D}${bindir}
+        install -m 0755 ${S}/CPP/7zip/UI/Console/b/${INSTALLDIR}/7z ${D}${bindir}/7z.real
+        install -m 0755 ${UNPACKDIR}/7z_wrapper.sh ${D}${bindir}/7z
+
+        install -d ${D}${libdir}
+        install -m 0755 ${S}/CPP/7zip/Bundles/Format7zF/b/${INSTALLDIR}/7z.so ${D}${libdir}/lib7z.so
+        ln -rsn ${D}${libdir}/lib7z.so ${D}${bindir}/7z.so
+
+        # install headers (for development) and readme (for version information)
+        for header_file in $(find ${S}/CPP/${BPN} ${S}/CPP/Common ${S}/C -name "*.h"); do
+                header_dir=$(dirname $(echo $header_file | sed "s|${S}/||"))
+                install -d ${D}${includedir}/${BPN}/$header_dir
+                install -m 0644 $header_file ${D}${includedir}/${BPN}/$header_dir
+        done
+        install -d ${D}${includedir}/${BPN}/DOC
+        install -m 0644 ${S}/DOC/readme.txt ${D}${includedir}/${BPN}/DOC
+}
+
+PROVIDES += "p7zip"
+RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so p7zip"
+RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch
new file mode 100644
index 0000000000..b6e24a9519
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-running-tests-on-target-when-cross-compiling.patch
@@ -0,0 +1,45 @@
+From 9f0eed91d32ec2f310bd5c23af187f888394fcb4 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Wed, 2 Apr 2025 09:33:03 +0200
+Subject: [PATCH] Allow running tests on target when cross-compiling
+
+When bit7z is Cross-compiled, target device does not contain
+source/build directory anymore and thus path to test data is different.
+Make it possible to pass the new path to cmake.
+
+Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/289]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tests/CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 60da280..dbdff1f 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -49,6 +49,11 @@ add_executable( ${TESTS_TARGET_PUBLIC} ${SOURCE_FILES} ${PUBLIC_API_SOURCE_FILES
+ 
+ if( BIT7Z_TESTS_FILESYSTEM )
+     set( BIT7Z_TESTS_DATA_DIR ${CMAKE_CURRENT_BINARY_DIR}/data )
++    if( NOT BIT7Z_TESTS_DATA_DIR_TARGET )
++        set( BIT7Z_TESTS_DATA_DIR_TARGET ${BIT7Z_TESTS_DATA_DIR} )
++    else()
++        message( STATUS "Custom test data dir on target: ${BIT7Z_TESTS_DATA_DIR_TARGET}" )
++    endif()
+ 
+     include( FetchContent )
+     FetchContent_Declare( bit7z-test-data
+@@ -61,11 +66,11 @@ if( BIT7Z_TESTS_FILESYSTEM )
+     message( STATUS "Tests data directory: ${BIT7Z_TESTS_DATA_DIR}" )
+     target_compile_definitions( ${TESTS_TARGET} PRIVATE
+                                 BIT7Z_TESTS_FILESYSTEM
+-                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" )
++                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" )
+     target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE
+                                 BIT7Z_TESTS_PUBLIC_API_ONLY
+                                 BIT7Z_TESTS_FILESYSTEM
+-                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR}" )
++                                BIT7Z_TESTS_DATA_DIR="${BIT7Z_TESTS_DATA_DIR_TARGET}" )
+     if( NOT EXISTS ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty )
+         file( MAKE_DIRECTORY ${BIT7Z_TESTS_DATA_DIR}/test_filesystem/empty )
+     endif()
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch
new file mode 100644
index 0000000000..adc0d67d97
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Allow-specifying-path-to-7z-library-in-tests.patch
@@ -0,0 +1,48 @@
+From 60137ec132951f941f2fb98cd6353717b322cbf1 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Wed, 2 Apr 2025 10:17:38 +0200
+Subject: [PATCH] Allow specifying path to 7z library in tests
+
+For instance to override path to library on Linux when using real 7-zip
+instead of pzip: /usr/lib/lib7z.so
+
+Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/288]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tests/CMakeLists.txt           | 7 +++++++
+ tests/src/utils/shared_lib.hpp | 4 +++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 60da280d..1307366a 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -103,6 +103,13 @@ message( STATUS "Use system 7-zip for tests: ${BIT7Z_TESTS_USE_SYSTEM_7ZIP}" )
+ if( BIT7Z_TESTS_USE_SYSTEM_7ZIP )
+     target_compile_definitions( ${TESTS_TARGET} PRIVATE BIT7Z_TESTS_USE_SYSTEM_7ZIP )
+     target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE BIT7Z_TESTS_USE_SYSTEM_7ZIP )
++else()
++    set( BIT7Z_TESTS_7Z_LIBRARY_PATH "" CACHE STRING "The path of the 7-Zip library to be used for running the tests" )
++    if( NOT BIT7Z_TESTS_7Z_LIBRARY_PATH STREQUAL "" )
++        message( STATUS "Use custom 7-zip library for tests: ${BIT7Z_TESTS_7Z_LIBRARY_PATH}" )
++        target_compile_definitions( ${TESTS_TARGET} PRIVATE BIT7Z_TESTS_7Z_LIBRARY_PATH="${BIT7Z_TESTS_7Z_LIBRARY_PATH}" )
++        target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE BIT7Z_TESTS_7Z_LIBRARY_PATH="${BIT7Z_TESTS_7Z_LIBRARY_PATH}" )
++    endif()
+ endif()
+ 
+ # Avoiding linking unnecessary libraries.
+diff --git a/tests/src/utils/shared_lib.hpp b/tests/src/utils/shared_lib.hpp
+index 41435a9b..8bc02939 100644
+--- a/tests/src/utils/shared_lib.hpp
++++ b/tests/src/utils/shared_lib.hpp
+@@ -20,7 +20,9 @@ namespace bit7z {
+ namespace test {
+ 
+ inline auto sevenzip_lib_path() -> tstring {
+-#ifdef BIT7Z_TESTS_USE_SYSTEM_7ZIP
++#ifdef BIT7Z_TESTS_7Z_LIBRARY_PATH
++    static const tstring lib_path = BIT7Z_STRING( BIT7Z_TESTS_7Z_LIBRARY_PATH );
++#elif defined( BIT7Z_TESTS_USE_SYSTEM_7ZIP )
+ #ifdef _WIN64
+     static const tstring lib_path = BIT7Z_STRING( "C:\\Program Files\\7-Zip\\7z.dll" );
+ #elif defined( _WIN32 )
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch
new file mode 100644
index 0000000000..b1bf6923f2
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch
@@ -0,0 +1,41 @@
+From d504abaf2b0a514193f52df42098bc16de4718b2 Mon Sep 17 00:00:00 2001
+From: Oz <rik20@live.it>
+Date: Fri, 17 Jan 2025 21:23:59 +0100
+Subject: [PATCH] Fix int8_t storage in BitPropVariant on Arm architectures
+
+Upstream-Status: Backport [https://github.com/rikyoz/bit7z/commit/d504abaf2b0a514193f52df42098bc16de4718b2]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ include/bit7z/bitwindows.hpp | 4 ++++
+ src/bitpropvariant.cpp       | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/include/bit7z/bitwindows.hpp b/include/bit7z/bitwindows.hpp
+index 5849b956..2f29a989 100644
+--- a/include/bit7z/bitwindows.hpp
++++ b/include/bit7z/bitwindows.hpp
+@@ -126,7 +126,11 @@ struct PROPVARIANT {
+     WORD wReserved2;
+     WORD wReserved3;
+     union {
++#if defined( __arm__ ) || defined( __aarch64__ )
++        signed char cVal;
++#else
+         char cVal;
++#endif
+         unsigned char bVal;
+         short iVal;
+         unsigned short uiVal;
+diff --git a/src/bitpropvariant.cpp b/src/bitpropvariant.cpp
+index 1e7f094f..642e1268 100644
+--- a/src/bitpropvariant.cpp
++++ b/src/bitpropvariant.cpp
+@@ -157,7 +157,7 @@ BitPropVariant::BitPropVariant( uint64_t value ) noexcept: PROPVARIANT() {
+ BitPropVariant::BitPropVariant( int8_t value ) noexcept: PROPVARIANT() {
+     vt = VT_I1;
+     wReserved1 = 0;
+-    cVal = static_cast< char >( value );
++    cVal = static_cast< decltype(cVal) >( value );
+ }
+ 
+ BitPropVariant::BitPropVariant( int16_t value ) noexcept: PROPVARIANT() {
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch
new file mode 100644
index 0000000000..08b64f4999
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-reinterpret-cast-compiler-errors.patch
@@ -0,0 +1,52 @@
+From bedeec4d57d29be7de91697277ace00ba87d3e75 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Tue, 1 Apr 2025 15:23:51 +0200
+Subject: [PATCH] Fix reinterpret-cast compiler errors
+
+Building on 32-bit arm, following warning/error occurs:
+
+src/internal/windows.cpp: In function 'bit7z::OLECHAR* AllocStringBuffer(LPCSTR, uint32_t)':
+src/internal/windows.cpp:79:6: error: cast from 'unsigned char*' to 'bstr_prefix_t*' {aka 'unsigned int*'} increases required alignment of target type [-Werror=cast-align]
+   79 |     *reinterpret_cast< bstr_prefix_t* >( bstrBuffer ) = byteLength;
+      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+git/src/internal/windows.cpp:83:19: error: cast from 'unsigned char*' to 'bit7z::BSTR' {aka 'wchar_t*'} increases required alignment of target type [-Werror=cast-align]
+   83 |     BSTR result = reinterpret_cast< BSTR >( bstrBuffer + sizeof( bstr_prefix_t ) );
+      |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1plus: all warnings being treated as errors
+
+Fix it by using the desired variable size right away and thus avoid
+casting to an array with different alignment.
+
+Upstream-Status: Backport [https://github.com/rikyoz/bit7z/commit/b2789ea9b0fbb2a74dbf6764ddb72d60659a3bce]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ src/internal/windows.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/internal/windows.cpp b/src/internal/windows.cpp
+index 9304aed7..7bee5959 100644
+--- a/src/internal/windows.cpp
++++ b/src/internal/windows.cpp
+@@ -68,19 +68,18 @@ auto AllocStringBuffer( LPCSTR str, uint32_t byteLength ) -> BSTR {
+ 
+     // Allocating memory for storing the BSTR as a byte array.
+     // NOLINTNEXTLINE(cppcoreguidelines-no-malloc, cppcoreguidelines-owning-memory)
+-    auto* bstrBuffer = static_cast< byte_t* >( std::calloc( bufferSize, sizeof( byte_t ) ) );
++    auto* bstrBuffer = static_cast< bstr_prefix_t* >( std::calloc( bufferSize, sizeof( byte_t ) ) );
+ 
+     if ( bstrBuffer == nullptr ) { // Failed to allocate memory for the BSTR buffer.
+         return nullptr;
+     }
+ 
+     // Storing the number of bytes of the BSTR as a prefix of it.
+-    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+-    *reinterpret_cast< bstr_prefix_t* >( bstrBuffer ) = byteLength;
++    *bstrBuffer = byteLength;
+ 
+     // The actual BSTR must point after the byteLength prefix.
+     // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic, cppcoreguidelines-pro-type-reinterpret-cast)
+-    BSTR result = reinterpret_cast< BSTR >( bstrBuffer + sizeof( bstr_prefix_t ) );
++    BSTR result = reinterpret_cast< BSTR >( bstrBuffer + 1 );
+     if ( str != nullptr ) {
+         // Copying byte-by-byte the input string to the BSTR.
+         // Note: flawfinder warns about not checking for buffer overflows; this is a false alarm,
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch
new file mode 100644
index 0000000000..b1f3d0f2ec
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-Fix-tests-with-musl.patch
@@ -0,0 +1,51 @@
+From bc5f2e5af90854c8f84b5829493dd01facf9af84 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Mon, 7 Apr 2025 16:29:32 +0200
+Subject: [PATCH] Fix tests with musl
+
+Upstream-Status: Submitted [https://github.com/rikyoz/bit7z/pull/292]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ tests/src/test_bitexception.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/tests/src/test_bitexception.cpp b/tests/src/test_bitexception.cpp
+index 7161fcc5..d85d430d 100644
+--- a/tests/src/test_bitexception.cpp
++++ b/tests/src/test_bitexception.cpp
+@@ -49,6 +49,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_OPEN_FAILED ),
+ #ifdef _WIN32
+       "The system cannot open the device or file specified.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
+@@ -67,6 +69,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_SEEK ),
+ #ifdef _WIN32
+       "The drive cannot locate a specific area or track on the disk.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
+@@ -74,6 +78,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_READ_FAULT ),
+ #ifdef _WIN32
+       "The system cannot read from the specified device.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
+@@ -81,6 +87,8 @@ constexpr PortableErrorTest hresult_tests[] = { // NOLINT(*-avoid-c-arrays)
+     { HRESULT_WIN32_TEST( ERROR_WRITE_FAULT ),
+ #ifdef _WIN32
+       "The system cannot write to the specified device.",
++#elif defined( __linux__ ) && !defined ( __GLIBC__ )
++      "I/O error",
+ #else
+         "Input/output error",
+ #endif
diff --git a/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-dependency-inclusion.patch b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-dependency-inclusion.patch
new file mode 100644
index 0000000000..1b0dfa1eb1
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/0001-cmake-disable-dependency-inclusion.patch
@@ -0,0 +1,29 @@
+From 5e23482b89dfbed025eb5e505aba6420512bd9c3 Mon Sep 17 00:00:00 2001
+From: Peter Marko <peter.marko@siemens.com>
+Date: Tue, 1 Apr 2025 11:31:38 +0200
+Subject: [PATCH] cmake: disable dependency inclusion
+
+In Yocto we don't download dependencies, they are satisfied from
+sysroot.
+This cmake file would try to download dependency management tool CPM
+even if all dependencies are satisfied.
+
+Upstream-Status: Inappropriate [OE-specific]
+Signed-off-by: Peter Marko <peter.marko@siemens.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5378bb3..5916025 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -194,7 +194,7 @@ include( cmake/BuildOptions.cmake )
+ include( cmake/CompilerOptions.cmake )
+ 
+ # dependencies
+-include( cmake/Dependencies.cmake )
++#include( cmake/Dependencies.cmake )
+ 
+ # 7-zip source code
+ target_link_libraries( ${LIB_TARGET} PRIVATE 7-zip )
diff --git a/meta-oe/recipes-extended/7zip/bit7z/run-ptest b/meta-oe/recipes-extended/7zip/bit7z/run-ptest
new file mode 100644
index 0000000000..dd1776cab6
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z/run-ptest
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Disabled tests:
+# "winapi: Allocating BSTR string from nullptr C strings"
+#   this test is memory hungry, it allocates 800MB chunks
+#   it succeeds when there is enough free RAM, but most machines don't have it
+
+if /usr/lib/bit7z/ptest/bit7z-tests ~"winapi: Allocating BSTR string from nullptr C strings"; then
+    echo "PASS: bit7z-tests"
+else
+    echo "FAIL: bit7z-tests"
+fi
+
+if /usr/lib/bit7z/ptest/bit7z-tests-public; then
+    echo "PASS: bit7z-tests-public"
+else
+    echo "FAIL: bit7z-tests-public"
+fi
diff --git a/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb b/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
new file mode 100644
index 0000000000..033461d614
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/bit7z_4.0.9.bb
@@ -0,0 +1,88 @@
+SUMMARY = "A C++ static library offering a clean and simple interface to the 7-Zip shared libraries"
+HOMEPAGE = "https://github.com/rikyoz/bit7z"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=48a3fe23ed1353e0995dadfda05ffdb6"
+
+SRC_URI = " \
+    git://github.com/rikyoz/bit7z.git;protocol=https;branch=master \
+    ${@bb.utils.contains('PTEST_ENABLED', '1', d.getVar('SRC_URI_PTEST'), 'file://0001-cmake-disable-dependency-inclusion.patch', d)} \
+    file://0001-Fix-reinterpret-cast-compiler-errors.patch \
+    file://0001-Fix-int8_t-storage-in-BitPropVariant-on-Arm-architec.patch \
+    file://0001-Allow-running-tests-on-target-when-cross-compiling.patch \
+    file://0001-Allow-specifying-path-to-7z-library-in-tests.patch \
+    file://0001-Fix-tests-with-musl.patch \
+"
+
+SRCREV = "386e00ad3286e7a10e5bb6d05a5b41b523fce623"
+
+# ptest dependencies and their revisions
+SRC_URI_PTEST = " \
+    git://github.com/rikyoz/filesystem.git;protocol=https;branch=glibcxx_wchar_streams_workaround;name=filesystem;destsuffix=filesystem \
+    git://github.com/rikyoz/bit7z-test-data.git;protocol=https;branch=main;name=testdata;destsuffix=testdata \
+    git://github.com/catchorg/Catch2.git;protocol=https;branch=v2.x;name=catch2;destsuffix=catch2;tag=${TAG_catch2} \
+    https://github.com/cpm-cmake/CPM.cmake/releases/download/v${TAG_CPM}/CPM.cmake;downloadfilename=CPM_${TAG_CPM}.cmake \
+    file://run-ptest \
+"
+SRCREV_FORMAT = "${@bb.utils.contains('PTEST_ENABLED', '1', 'default_filesystem_testdata_catch2', 'default', d)}"
+SRCREV_filesystem = "983650f374699e3979f9cdefe13ddff60bd4ac68"
+SRCREV_testdata = "077e407b1c07b7443626b5902eeb4819388bf656"
+SRCREV_catch2 = "182c910b4b63ff587a3440e08f84f70497e49a81"
+TAG_catch2 = "v2.13.10"
+SRCHASH_CPM = "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d"
+TAG_CPM = "0.40.2"
+SRC_URI[sha256sum] = "${SRCHASH_CPM}"
+
+
+inherit cmake ptest
+
+DEPENDS = "7zip"
+
+EXTRA_OECMAKE += "-DBIT7Z_CUSTOM_7ZIP_PATH=${STAGING_INCDIR}/7zip"
+
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
+PACKAGECONFIG[tests] = " \
+    -DBIT7Z_BUILD_TESTS=ON -DBIT7Z_DISABLE_USE_STD_FILESYSTEM=ON \
+    -DBIT7Z_TESTS_USE_SYSTEM_7ZIP=OFF -DBIT7Z_TESTS_7Z_LIBRARY_PATH=${libdir}/lib7z.so \
+    -DBIT7Z_TESTS_DATA_DIR_TARGET=${PTEST_PATH}/data \
+    -DCPM_SOURCE_CACHE=${B}/cpm_cache -DFETCHCONTENT_SOURCE_DIR_BIT7Z-TEST-DATA=${UNPACKDIR}/testdata -DFETCHCONTENT_SOURCE_DIR_CATCH2=${B}/catch2 \
+"
+
+do_configure:prepend() {
+    # verify that all dependencies have correct version
+    grep -q ${SRCREV_filesystem} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_filesystem'!"
+    grep -q ${SRCREV_testdata} ${S}/tests/CMakeLists.txt || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_testdata'!"
+    grep -q ${TAG_catch2} ${S}/tests/cmake/Catch2.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCREV_catch2'!"
+    grep -q ${SRCHASH_CPM} ${S}/cmake/Dependencies.cmake || bbfatal "ERROR: dependency version mismatch, please update 'SRCHASH_CPM'!"
+
+    if ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
+        # use cache instead of download for CPM (CMake's missing package manager)
+        mkdir -p ${B}/cmake
+        cp ${UNPACKDIR}/CPM_${TAG_CPM}.cmake ${B}/cmake
+        mkdir -p ${B}/cpm_cache/ghc_filesystem
+        cp -r ${UNPACKDIR}/filesystem ${B}/cpm_cache/ghc_filesystem/fbcc9a9e94e6365273cf51294173f21ff5efdb4f
+        # avoid buildpaths issue as unpackdir is not in prefix maps
+        cp -r ${UNPACKDIR}/catch2 ${B}
+    fi
+}
+do_configure[cleandirs] += "${B}"
+
+do_install() {
+    install -d ${D}${libdir}
+    install -m 0644 ${S}/lib/*/*.a ${D}${libdir}
+
+    install -d ${D}${includedir}/${BPN}
+    install -m 0644 ${S}/include/${BPN}/*.hpp ${D}${includedir}/${BPN}
+}
+
+do_install_ptest() {
+    install -m 0755 ${S}/bin/*/* ${D}${PTEST_PATH}
+    install -d ${D}${PTEST_PATH}/data
+    cp -r ${UNPACKDIR}/testdata/test_archives ${UNPACKDIR}/testdata/test_filesystem ${B}/tests/data/test_filesystem ${D}${PTEST_PATH}/data
+}
+
+# this package contains static library so main package is empty, but ptest package rdepends on it
+ALLOW_EMPTY:${PN} = "1"
+# these are loaded via dlopen, so need explicit rdepends
+RDEPENDS:${PN}-ptest += "libstdc++ 7zip"
+# test data contains various file types with different architectures
+INSANE_SKIP:${PN}-ptest += "arch"
diff --git a/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch b/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch
new file mode 100644
index 0000000000..e3d0477930
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/files/0001-support-yocto-cross-compiling.patch
@@ -0,0 +1,53 @@
+From fd0d54f96576a8ff572bb7c7d28df6b097f99a30 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 18 Dec 2024 16:38:11 +0800
+Subject: [PATCH] support yocto cross compiling
+
+Remove -s from $LFLAGS_STRIP, do not strip binary to workaournd
+Yocto build warning
+...
+WARNING: 7zip-native-24.09-r0 do_populate_sysroot: File 'tmp/work/x86_64-linux/
+7zip-native/24.09/recipe-sysroot-native/usr/lib/7z.so' from 7zip-native was already stripped,
+this will prevent future debugging!
+...
+
+Apply CC, CXX from environments
+
+Upstream-Status: Inappropriate [Yocto specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ CPP/7zip/7zip_gcc.mak | 2 +-
+ CPP/7zip/var_gcc.mak  | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+--- a/CPP/7zip/7zip_gcc.mak
++++ b/CPP/7zip/7zip_gcc.mak
+@@ -45,7 +45,7 @@ CFLAGS_DEBUG = -g
+ else
+ CFLAGS_DEBUG = -DNDEBUG
+ ifneq ($(CC), $(CROSS_COMPILE)clang)
+-LFLAGS_STRIP = -s
++LFLAGS_STRIP =
+ endif
+ endif
+ 
+--- a/CPP/7zip/var_gcc.mak
++++ b/CPP/7zip/var_gcc.mak
+@@ -6,7 +6,5 @@ IS_ARM64=
+ CROSS_COMPILE=
+ MY_ARCH=
+ USE_ASM=
+-CC=$(CROSS_COMPILE)gcc
+-CXX=$(CROSS_COMPILE)g++
+ 
+ # -march=armv8-a+crc+crypto
+--- a/CPP/7zip/var_clang.mak
++++ b/CPP/7zip/var_clang.mak
+@@ -6,6 +6,4 @@ IS_ARM64=
+ CROSS_COMPILE=
+ MY_ARCH=
+ USE_ASM=
+-CC=$(CROSS_COMPILE)clang
+-CXX=$(CROSS_COMPILE)clang++
+ USE_CLANG=1
diff --git a/meta-oe/recipes-extended/7zip/files/7z_wrapper.sh b/meta-oe/recipes-extended/7zip/files/7z_wrapper.sh
new file mode 100755
index 0000000000..af5b9b393a
--- /dev/null
+++ b/meta-oe/recipes-extended/7zip/files/7z_wrapper.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+realpath=`readlink -fn $0`
+realdir=`dirname $realpath`
+exec $realdir/7z.real "$@"
diff --git a/meta-oe/recipes-extended/beep/beep_1.4.12.bb b/meta-oe/recipes-extended/beep/beep_1.4.12.bb
index a4bc10c366..a8d720d9dd 100644
--- a/meta-oe/recipes-extended/beep/beep_1.4.12.bb
+++ b/meta-oe/recipes-extended/beep/beep_1.4.12.bb
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https;branch=master \
            file://0001-beep-library-Make-it-compatible-with-c99.patch"
 SRCREV = "11453a79f2cea81832329b06ca3a284aa7a0a52e"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "prefix='${prefix}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
index 5cd20c5b1c..397829c87b 100644
--- a/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
+++ b/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb
@@ -18,8 +18,9 @@ SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitw
 SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e"
 
 UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases"
+UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/${BPN}-v${PV}"
+S = "${UNPACKDIR}/${BPN}-v${PV}"
 
 DEPENDS = "ncurses readline"
 
@@ -27,6 +28,6 @@ inherit autotools ptest
 
 do_install_ptest() {
     install -d ${D}${PTEST_PATH}
-    install -m 0644 ${WORKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected
+    install -m 0644 ${UNPACKDIR}/ptest.out.expected ${D}${PTEST_PATH}/ptest.out.expected
 }
 
diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
index 4e35283dd2..3e626f32d9 100644
--- a/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
+++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb
@@ -41,7 +41,6 @@ inherit gettext autotools pkgconfig features_check systemd
 
 REQUIRED_DISTRO_FEATURES += "opengl"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "\
     --enable-libraries \
@@ -77,6 +76,13 @@ do_install:prepend() {
         mkdir -p ${D}${sysconfdir}/default
 }
 
+do_install:append() {
+        # By default, the SVN_VERSION definition looks like:
+        #define SVN_VERSION "$SHA1 [https://github.com/BOINC/boinc] ($HOSTNAME:$S [client_release/7/7.20]) [Server-Release: server_release/1.1/1.1.0]"
+        # ... remove HOSTNAME and S to make it reproducible.
+        sed -i -e '/^#define SVN_VERSION /s#(\S*:\S* \[#([#g' ${D}${includedir}/boinc/svn_version.h
+}
+
 SYSTEMD_SERVICE:${PN} = "boinc-client.service"
 
 FILES:${PN} += "${libdir}/systemd"
diff --git a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb b/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
index 83f44833b6..411f8a7610 100644
--- a/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
+++ b/meta-oe/recipes-extended/brotli/brotli_1.1.0.bb
@@ -7,9 +7,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=941ee9cd1609382f946352712a319b4b"
 
 SRC_URI = "git://github.com/google/brotli.git;branch=master;protocol=https"
-SRCREV= "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d"
+SRCREV = "ed738e842d2fbdf2d6459e39267a633c4a9b2f5d"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
@@ -20,4 +19,4 @@ do_install:append () {
         done
 }
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
index f761ccbdc8..53aabd6035 100644
--- a/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
+++ b/meta-oe/recipes-extended/byacc/byacc/0001-byacc-do-not-reorder-CC-and-CFLAGS.patch
@@ -24,16 +24,19 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 
 Update for 20210201
 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+
+Update for 20241231
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
 ---
  aclocal.m4 |   1 -
  configure  | 259 -----------------------------------------------------
  2 files changed, 260 deletions(-)
 
 diff --git a/aclocal.m4 b/aclocal.m4
-index 832d0c8..63b03f2 100644
+index 5c83bbd..ab3ffe7 100644
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -1421,7 +1421,6 @@ CF_GCC_VERSION
+@@ -1762,7 +1762,6 @@ CF_GCC_VERSION
  CF_ACVERSION_CHECK(2.52,
         [AC_PROG_CC_STDC],
         [CF_ANSI_CC_REQD])
@@ -42,20 +45,20 @@ index 832d0c8..63b03f2 100644
  dnl ---------------------------------------------------------------------------
  dnl CF_PROG_GROFF version: 3 updated: 2018/01/07 13:16:19
 diff --git a/configure b/configure
-index cb47b4c..c72b6e4 100755
+index da9a5c5..65ee092 100755
 --- a/configure
 +++ b/configure
-@@ -2144,265 +2144,6 @@ esac
+@@ -2152,265 +2152,6 @@ esac
  # This should have been defined by AC_PROG_CC
  : "${CC:=cc}"
  
--echo "$as_me:2147: checking \$CFLAGS variable" >&5
+-echo "$as_me:2155: checking \$CFLAGS variable" >&5
 -echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 -case "x$CFLAGS" in
 -(*-[IUD]*)
--       echo "$as_me:2151: result: broken" >&5
+-       echo "$as_me:2159: result: broken" >&5
 -echo "${ECHO_T}broken" >&6
--       { echo "$as_me:2153: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+-       { echo "$as_me:2161: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
 -echo "$as_me: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&2;}
 -       cf_flags="$CFLAGS"
 -       CFLAGS=
@@ -163,22 +166,22 @@ index cb47b4c..c72b6e4 100755
 -       done
 -       ;;
 -(*)
--       echo "$as_me:2261: result: ok" >&5
+-       echo "$as_me:2269: result: ok" >&5
 -echo "${ECHO_T}ok" >&6
 -       ;;
 -esac
 -
--echo "$as_me:2266: checking \$CC variable" >&5
+-echo "$as_me:2274: checking \$CC variable" >&5
 -echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 -case "$CC" in
 -(*[\ \ ]-*)
--       echo "$as_me:2270: result: broken" >&5
+-       echo "$as_me:2278: result: broken" >&5
 -echo "${ECHO_T}broken" >&6
--       { echo "$as_me:2272: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+-       { echo "$as_me:2280: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 -echo "$as_me: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 -       # humor him...
 -       cf_prog=`echo "$CC" | sed -e 's/        / /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
--       cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+-       cf_flags=`echo "$CC" | sed -e "s%^$cf_prog%%"`
 -       CC="$cf_prog"
 -       for cf_arg in $cf_flags
 -       do
@@ -291,26 +294,26 @@ index cb47b4c..c72b6e4 100755
 -       done
 -       test -n "$verbose" && echo "    resulting CC: '$CC'" 1>&6
 -
--echo "${as_me:-configure}:2389: testing resulting CC: '$CC' ..." 1>&5
+-echo "${as_me:-configure}:2397: testing resulting CC: '$CC' ..." 1>&5
 -
 -       test -n "$verbose" && echo "    resulting CFLAGS: '$CFLAGS'" 1>&6
 -
--echo "${as_me:-configure}:2393: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+-echo "${as_me:-configure}:2401: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 -
 -       test -n "$verbose" && echo "    resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 -
--echo "${as_me:-configure}:2397: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+-echo "${as_me:-configure}:2405: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 -
 -       ;;
 -(*)
--       echo "$as_me:2401: result: ok" >&5
+-       echo "$as_me:2409: result: ok" >&5
 -echo "${ECHO_T}ok" >&6
 -       ;;
 -esac
 -
- echo "$as_me:2406: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo "$as_me:2414: checking whether ${MAKE-make} sets \${MAKE}" >&5
  echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 -- 
-2.34.1
+2.43.0
 
diff --git a/meta-oe/recipes-extended/byacc/byacc_20230219.bb b/meta-oe/recipes-extended/byacc/byacc_20241231.bb
index 614bcaf646..8d74dbb83e 100644
--- a/meta-oe/recipes-extended/byacc/byacc_20230219.bb
+++ b/meta-oe/recipes-extended/byacc/byacc_20241231.bb
@@ -4,7 +4,7 @@
 # Setting to PD as this is what the upstream has it as.
 
 LICENSE = "PD"
-LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=b56b7454f5f865de2e6e35ee2185b461"
+LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=6a728308869d7a7901618a5bcb970f7e"
 require byacc.inc
 
-SRC_URI[sha256sum] = "36b972a6d4ae97584dd186925fbbc397d26cb20632a76c2f52ac7653cd081b58"
+SRC_URI[sha256sum] = "192c2fae048d4e7f514ba451627f9c4e612765099f819c19191f9fde3e609673"
diff --git a/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
new file mode 100644
index 0000000000..26c80195b0
--- /dev/null
+++ b/meta-oe/recipes-extended/canopenterm/canopenterm_1.0.10.bb
@@ -0,0 +1,29 @@
+
+SUMMARY = "CANopenTerm is a versatile software tool to analyse and \
+          configure CANopen devices. \
+          "
+DESCRIPTION = "CANopenTerm is an open-source software tool designed for the \
+              development, testing, and analysis of CANopen CC networks and \
+              devices.  It extends its capabilities to support other CAN CC \
+              protocols, including SAE J1939 and OBD-II. \
+              "
+HOMEPAGE = "https://canopenterm.de"
+BUGTRACKER = "https://github.com/CANopenTerm/CANopenTerm/issues"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=10e84ea70e8c3a1fbc462f5424806474"
+
+DEPENDS = "cjson libinih virtual/libsdl2 lua libsocketcan pocketpy"
+
+SRC_URI = "git://github.com/CANopenTerm/CANopenTerm.git;protocol=https;branch=main"
+
+SRCREV  = "e0760b2e9657907e691be4df384ca7617109635d"
+
+
+inherit cmake ptest
+
+EXTRA_OECMAKE += "-DBUILD_YOCTO=ON"
+
+FILES:${PN} += "${bindir}/CANopenTerm ${bindir}/codb2json ${datadir}"
+
+RDEPENDS:${PN} = "cjson libinih libsdl2 lua libsocketcan pocketpy"
diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb
index 68d4042554..1baacac03d 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb
@@ -22,12 +22,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
            "
-#SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98"
-SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16"
+SRC_URI[sha256sum] = "0adcfcf36d47317776ad64331058a4d2e3669683314716ddb885f8a13309f47d"
+
+UPSTREAM_CHECK_URI = "https://github.com/cfengine/masterfiles/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools
 
-export EXPLICIT_VERSION="${PV}"
+export EXPLICIT_VERSION = "${PV}"
 
 EXTRA_OECONF = "--prefix=${datadir}/cfengine"
 
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
index 6fa5d2743a..de20f585b0 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
@@ -22,12 +22,11 @@ SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-commu
            file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \
            file://set-path-of-default-config-file.patch \
            "
-#SRC_URI[md5sum] = "5318e40702bc66a3ece44ec4ad77712b"
 SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126"
 
 inherit autotools-brokensep systemd
 
-export EXPLICIT_VERSION="${PV}"
+export EXPLICIT_VERSION = "${PV}"
 
 SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \
                          cf-runalerts.service cf-execd.service \
diff --git a/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch b/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch
new file mode 100644
index 0000000000..1353728dd5
--- /dev/null
+++ b/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch
@@ -0,0 +1,58 @@
+From 0a49ed8e949adda11c6268f36a10ac12074cd377 Mon Sep 17 00:00:00 2001
+From: Yoann Congal <yoann.congal@smile.fr>
+Date: Tue, 1 Apr 2025 23:42:39 +0200
+Subject: [PATCH] reproducibility: Prevent configuration from reading host
+ directories
+
+Current code choose where to install fonts based on what directory
+exists on build host. This is not reproducible.
+
+Remove the existence check and change the lists to the one matching
+OpenEmbedded paths.
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
+---
+ CMakeLists.txt | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c5548b3..a2f8b4d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,8 +7,8 @@ set(VERSION "2.0")
+ 
+ # These are relative to CMAKE_INSTALL_PREFIX
+ # which by default is "/usr/local"
+-set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts")
+-set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc")
++set(CONSOLE_FONTS_DIRS "${CMAKE_INSTALL_DATAROOTDIR}/consolefonts")
++set(X_FONTS_DIRS "${CMAKE_INSTALL_LIBDIR}/X11/fonts/misc" "${CMAKE_INSTALL_DATAROOTDIR}/fonts/X11/misc")
+ 
+ set(MKFONTDIR "/usr/bin/mkfontdir")
+ 
+@@ -47,16 +47,13 @@ install(TARGETS cmatrix DESTINATION bin)
+ 
+ if     (UNIX)
+        foreach    (CONSOLE_FONTS_DIR ${CONSOLE_FONTS_DIRS})
+-               if     (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
+                        message(STATUS "Installing matrix console fonts to ${CMAKE_INSTALL_PREFIX}/${CONSOLE_FONTS_DIR}")
+                        install(FILES
+                                "${CMAKE_SOURCE_DIR}/matrix.fnt"
+                                "${CMAKE_SOURCE_DIR}/matrix.psf.gz"
+                                DESTINATION "${CONSOLE_FONTS_DIR}")
+-               endif  ()
+        endforeach ()
+        foreach    (X_FONTS_DIR ${X_FONTS_DIRS})
+-               if     (IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
+                        message(STATUS "Installing matrix X window fonts to ${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}")
+                        install(FILES
+                                "${CMAKE_SOURCE_DIR}/mtx.pcf"
+@@ -67,7 +64,6 @@ if     (UNIX)
+                                "execute_process(COMMAND \"${MKFONTDIR}\" \"${CMAKE_INSTALL_PREFIX}/${X_FONTS_DIR}\")")
+                        install(CODE
+                                "message(STATUS \"If this is the first time you have installed CMatrix you will probably have to restart X window in order to use the mtx.pcf font.\")")
+-               endif  ()
+        endforeach ()
+ endif  ()
+ 
diff --git a/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb b/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
index 6b6acf1be8..e1a6af622b 100644
--- a/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
+++ b/meta-oe/recipes-extended/cmatrix/cmatrix_2.0.bb
@@ -3,12 +3,14 @@ SUMMARY = "Terminal based 'The Matrix' screen implementation"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https"
+SRC_URI = " \
+    git://github.com/abishekvashok/cmatrix.git;branch=stable;protocol=https \
+    file://0001-reproducibility-Prevent-configuration-from-reading-h.patch \
+"
 SRCREV = "adfdf1656f23e5ab3b52c7d7edf91249a4477e8d"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
 DEPENDS += "ncurses"
 
-FILES:${PN} += "${datadir}/* ${libdir}/kbd/*"
+FILES:${PN} += "${datadir}/* ${libdir}/kbd/* ${libdir}/X11/fonts/"
diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
index 781dc83da9..da710eaedb 100644
--- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb
+++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.5.bb
@@ -6,21 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
 SECTION = "Development/Libraries"
 DEPENDS = "swig-native sblim-cmpi-devel python3-setuptools-native"
 
-SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \
+SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=main \
            file://cmpi-bindings-0.4.17-no-ruby-perl.patch \
            file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \
            file://0001-Fix-error.patch \
            "
 
-SRCREV = "69077ee4d249816ed428155fc933dca424167e77"
-S = "${WORKDIR}/git"
+SRCREV = "49d6dcfc71ca421100fcf325e31625817c469fc9"
 
 inherit cmake python3targetconfig
 
 EXTRA_OECMAKE = "-DLIB='${baselib}' \
                  -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
                  -DPYTHON_ABI=${PYTHON_ABI} \
-                 -DBUILD_PYTHON3=YES \
+                 -DBUILD_PYTHON3=NO \
                  -DPython3_SITE_DIR=${PYTHON_SITEPACKAGES_DIR} \
                  "
 
@@ -28,7 +27,11 @@ EXTRA_OECMAKE = "-DLIB='${baselib}' \
 # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)
 OECMAKE_GENERATOR = "Unix Makefiles"
 
-FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
+FILES:${PN} =+ "${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/*"
 FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so"
 
 BBCLASSEXTEND = "native"
+
+# http://errors.yoctoproject.org/Errors/Details/766910/
+# cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
index 02f1fcb420..36aad73b19 100644
--- a/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
+++ b/meta-oe/recipes-extended/collectd/collectd_5.12.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "https://collectd.org/files/collectd-${PV}.tar.bz2 \
            file://0006-libcollectdclient-Fix-string-overflow-errors.patch \
            file://0001-Remove-including-sys-sysctl.h-on-glibc-based-systems.patch \
            "
-SRC_URI[md5sum] = "2b23a65960bc323d065234776a542e04"
 SRC_URI[sha256sum] = "5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6"
 
 inherit autotools python3native update-rc.d pkgconfig systemd
@@ -53,6 +52,7 @@ PACKAGECONFIG[ldap] = "--enable-openldap --with-libldap,--disable-openldap --wit
 PACKAGECONFIG[rrdtool] = "--enable-rrdtool,--disable-rrdtool,rrdtool"
 PACKAGECONFIG[rrdcached] = "--enable-rrdcached,--disable-rrdcached,rrdtool"
 PACKAGECONFIG[python] = "--enable-python,--disable-python"
+PACKAGECONFIG[dpdk] = "--with-libdpdk,--without-libdpdk,dpdk"
 
 EXTRA_OECONF = " \
                 ${FPLAYOUT} \
@@ -63,7 +63,7 @@ EXTRA_OECONF = " \
 
 do_install:append() {
     install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd
+    install -m 0755 ${UNPACKDIR}/collectd.init ${D}${sysconfdir}/init.d/collectd
     sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/collectd
     sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/collectd
     sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/collectd
@@ -77,7 +77,7 @@ do_install:append() {
 
     # Install systemd unit files
     install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/collectd.service ${D}${systemd_unitdir}/system
+    install -m 0644 ${UNPACKDIR}/collectd.service ${D}${systemd_unitdir}/system
     sed -i -e 's,@SBINDIR@,${sbindir},g' \
         ${D}${systemd_unitdir}/system/collectd.service
 }
diff --git a/meta-oe/recipes-extended/ddrescue/ddrescue_1.28.bb b/meta-oe/recipes-extended/ddrescue/ddrescue_1.29.1.bb
index 0863fc1209..99c7d06706 100644
--- a/meta-oe/recipes-extended/ddrescue/ddrescue_1.28.bb
+++ b/meta-oe/recipes-extended/ddrescue/ddrescue_1.29.1.bb
@@ -6,12 +6,12 @@ HOMEPAGE = "http://www.gnu.org/software/ddrescue/ddrescue.html"
 SECTION = "console"
 LICENSE = "GPL-2.0-or-later"
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=76d6e300ffd8fb9d18bd9b136a9bba13 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=cca7f74ec83b7a9ce7ccd195aad471bd \
                     file://main_common.cc;beginline=5;endline=16;md5=ad099df052bdd8297f490712285069da \
                     "
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.lz"
-SRC_URI[sha256sum] = "6626c07a7ca1cc1d03cad0958522c5279b156222d32c342e81117cfefaeb10c1"
+SRC_URI[sha256sum] = "ddd7d45df026807835a2ec6ab9c365df2ef19e8de1a50ffe6886cd391e04dd75"
 
 # This isn't already added by base.bbclass
 do_unpack[depends] += "lzip-native:do_populate_sysroot"
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
index a497175364..7c596371e5 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.3-20250116.bb
@@ -9,10 +9,10 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz"
-SRC_URI[sha256sum] = "339d311c6abb240213426b99ad63565cbcb3e8641ef1989c033e945b754d34ef"
+SRC_URI[sha256sum] = "68406329827b783d0a8959cc20a94c6e1791ac861a27f854e06e9020541816dd"
 
 # hardcoded here for use in dialog-static recipe
-S = "${WORKDIR}/dialog-${PV}"
+S = "${UNPACKDIR}/dialog-${PV}"
 
 inherit autotools-brokensep pkgconfig
 
@@ -29,3 +29,6 @@ do_configure() {
     sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure
     oe_runconf
 }
+do_install:append () {
+        ln -sf ${bindir}/${HOST_SYS}-dialog ${D}${bindir}/${BPN}
+}
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch
new file mode 100644
index 0000000000..335872c40f
--- /dev/null
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon/0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch
@@ -0,0 +1,40 @@
+From bc03f142507da92add8ba325fdf8187d47a7d719 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 13 Dec 2024 16:37:24 +0800
+Subject: [PATCH] CMakeLists.txt: make DLT_WatchdogSec can be set by user
+
+In my test env, WatchdogSec default value 2 is not enough, manually
+changed to 3 is ok. This makes dlt.service/dlt-system.service start
+failed during boot time. So, make DLT_WatchdogSec can be set by user, so
+user can set them to proper value at build time, then service can start
+successfully in boot time.
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+
+Upstream-Status: Backport [https://github.com/COVESA/dlt-daemon/pull/720/commits/bc03f142507da92add8ba325fdf8187d47a7d719]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ systemd/CMakeLists.txt | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
+index 16cbe86b5..659378d16 100644
+--- a/systemd/CMakeLists.txt
++++ b/systemd/CMakeLists.txt
+@@ -18,10 +18,14 @@ if(WITH_SYSTEMD)
+     set(SYSTEMD_CONFIGURATIONS_FILES_DIR ${SYSTEMD_UNITDIR} )
+ 
+     if(WITH_SYSTEMD_WATCHDOG)
+-        set( DLT_WatchdogSec 2 )
++        if(NOT DEFINED DLT_WatchdogSec)
++            set(DLT_WatchdogSec 2 CACHE STRING "Watchdog timeout in seconds")
++        endif()
+         message( STATUS "The systemd watchdog is enabled - timeout is set to ${DLT_WatchdogSec} seconds")
+     else(WITH_SYSTEMD_WATCHDOG)
+-        set( DLT_WatchdogSec 0 )
++        if(NOT DEFINED DLT_WatchdogSec)
++             set(DLT_WatchdogSec 0 CACHE STRING "Watchdog timeout in seconds")
++        endif()
+         message( STATUS "The systemd watchdog is disabled")
+     endif(WITH_SYSTEMD_WATCHDOG)
diff --git a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
index 3d2e4a73f1..8b48d20aac 100644
--- a/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
+++ b/meta-oe/recipes-extended/dlt-daemon/dlt-daemon_2.18.10.bb
@@ -19,10 +19,10 @@ SRC_URI = "git://github.com/COVESA/${BPN}.git;protocol=https;branch=master \
            file://0004-Modify-systemd-config-directory.patch \
            file://544.patch \
            file://567.patch \
+           file://0001-CMakeLists-txt-make-DLT_WatchdogSec-can-be-set-by-user.patch \
            "
 SRCREV = "0f2d4cfffada6f8448a2cb27995b38eb4271044f"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd systemd-watchdog systemd-journal ', '', d)} \
  dlt-examples dlt-adaptor dlt-adaptor-stdin dlt-adaptor-udp dlt-console \
diff --git a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
index ec0b4da935..71305cc35f 100644
--- a/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
+++ b/meta-oe/recipes-extended/docopt.cpp/docopt.cpp_git.bb
@@ -20,7 +20,6 @@ SRC_URI = "\
     git://github.com/docopt/docopt.cpp.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb
index 22b6c782a6..afa0e4c8fb 100644
--- a/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb
+++ b/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb
@@ -11,6 +11,8 @@ inherit ptest
 
 SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890"
 
+UPSTREAM_CHECK_URI = "https://duktape.org/download"
+
 EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR='/${baselib}'"
 
 do_compile () {
@@ -30,11 +32,11 @@ do_install () {
 }
 
 do_install_ptest() {
-    install -m 0755 "${WORKDIR}/duktape-2.7.0/hello" "${D}${PTEST_PATH}"
-    install -m 0755 "${WORKDIR}/duktape-2.7.0/eval" "${D}${PTEST_PATH}"
-    install -m 0755 "${WORKDIR}/duktape-2.7.0/evloop" "${D}${PTEST_PATH}"
-    install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}"
-    install -m 0755 "${WORKDIR}/duktape-2.7.0/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}"
+    install -m 0755 "${S}/hello" "${D}${PTEST_PATH}"
+    install -m 0755 "${S}/eval" "${D}${PTEST_PATH}"
+    install -m 0755 "${S}/evloop" "${D}${PTEST_PATH}"
+    install -m 0755 "${S}/examples/eventloop/timer-test.js" "${D}${PTEST_PATH}"
+    install -m 0755 "${S}/examples/eventloop/ecma_eventloop.js" "${D}${PTEST_PATH}"
 }
 
 RDEPENDS:${PN}-ptest += "make"
diff --git a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
index 310081b822..ad2aee4570 100644
--- a/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
+++ b/meta-oe/recipes-extended/dumb-init/dumb-init_1.2.5.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5940d39995ea6857d01b8227109c2e9c"
 
 SRCREV = "89c1502b9d40b5cb4a844498b14d74ba1dd559bf"
 SRC_URI = "git://github.com/Yelp/dumb-init;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS} ${LDFLAGS}'"
 
diff --git a/meta-oe/recipes-extended/enscript/enscript/0001-enscript-does-not-build-with-C23-standard.patch b/meta-oe/recipes-extended/enscript/enscript/0001-enscript-does-not-build-with-C23-standard.patch
new file mode 100644
index 0000000000..28f6764319
--- /dev/null
+++ b/meta-oe/recipes-extended/enscript/enscript/0001-enscript-does-not-build-with-C23-standard.patch
@@ -0,0 +1,32 @@
+From 9865262d7287320eba7d2fad2d4fcb12b489fc6c Mon Sep 17 00:00:00 2001
+From: zdohnal <email-is-unavailable>
+Date: Tue, 8 Apr 2025 20:25:47 +0900
+Subject: [PATCH] enscript does not build with C23 standard
+
+* Imported the submitted patch from:
+  https://savannah.gnu.org/bugs/?66845
+  to fix:
+  http://errors.yoctoproject.org/Errors/Details/851187/
+  ../../enscript-1.6.6/compat/regex.c:3565:13: error: too many arguments to function 're_match_2_internal'; expected 0, have 8
+ 3565 |       val = re_match_2_internal (bufp, string1, size1, string2, size2,
+      |             ^~~~~~~~~~~~~~~~~~~  ~~~~
+
+Upstream-Status: Submitted [https://savannah.gnu.org/bugs/?66845]
+Signed-off-by: mark.yang <mark.yang@lge.com>
+---
+ compat/regex.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/compat/regex.c b/compat/regex.c
+index c6907f3..da28664 100644
+--- a/compat/regex.c
++++ b/compat/regex.c
+@@ -336,7 +336,7 @@ typedef char boolean;
+ #define false 0
+ #define true 1
+ 
+-static int re_match_2_internal ();
++static int re_match_2_internal (struct re_pattern_buffer*, const char*, int, const char*, int, int, struct re_registers*, int);
+ 
+ /* These are the command codes that appear in compiled regular
+    expressions.  Some opcodes are followed by argument bytes.  A
diff --git a/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch b/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch
index a080b3aef7..e84c2d3937 100644
--- a/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch
+++ b/meta-oe/recipes-extended/enscript/enscript/0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch
@@ -3,9 +3,10 @@ From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 2 Sep 2022 21:24:27 -0700
 Subject: [PATCH] getopt: Include string.h for strcmp/stcncmp functions
 
-Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Backport [http://git.savannah.gnu.org/gitweb/?p=enscript.git;a=commit;h=300ecf85a8fe166a39f9dd818945c7b8a970db39]
+Signed-off-by: mark.yang <mark.yang@lge.com>
 ---
  compat/getopt.c | 1 +
  1 file changed, 1 insertion(+)
diff --git a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
index 9490ee09dc..4ca7c081ea 100644
--- a/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
+++ b/meta-oe/recipes-extended/enscript/enscript_1.6.6.bb
@@ -14,13 +14,13 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://enscript-autoconf.patch \
            file://0001-Fix-builds-with-recent-gettext.patch \
            file://0001-getopt-Include-string.h-for-strcmp-stcncmp-functions.patch \
+           file://0001-enscript-does-not-build-with-C23-standard.patch \
            "
 
 inherit autotools gettext
 
 EXTRA_OECONF += "PERL='${USRBINPATH}/env perl'"
 
-SRC_URI[md5sum] = "3acc242b829adacabcaf28533f049afd"
 SRC_URI[sha256sum] = "6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb"
 
 RDEPENDS:${PN} = "perl"
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch
new file mode 100644
index 0000000000..87000b663d
--- /dev/null
+++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch
@@ -0,0 +1,33 @@
+From aeb34f58782fb6d06aea4f5cbeccb23a0224466e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 4 Sep 2024 14:54:42 -0700
+Subject: [PATCH] Replacing GPR_ASSERT with c assert
+
+Latest GRPC >= 2.66 has dropped GRPC_ASSERT macro [1]
+
+[1] https://github.com/grpc/grpc/commit/0e23c2259da967a037e839e80cafd62bc6f9f68e
+
+Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/281]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/v3/Action.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/src/v3/Action.cpp
++++ b/src/v3/Action.cpp
+@@ -2,6 +2,15 @@
+ #include <grpc/support/log.h>
+ #include <grpcpp/support/status.h>
+ #include "etcd/v3/action_constants.hpp"
++#include <cstdlib>
++
++#ifndef GPR_ASSERT
++#define GPR_ASSERT(x)                                             \
++  if (!(x)) {                                                     \
++    fprintf(stderr, "%s:%d assert failed\n", __FILE__, __LINE__); \
++    abort();                                                      \
++}
++#endif
+ 
+ etcdv3::Action::Action(etcdv3::ActionParameters const& params) {
+   parameters = params;
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch
deleted file mode 100644
index ce12d4270a..0000000000
--- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-cmake-fix-when-cross-compiling.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From cb79329010d73e36ce64830914005f1c17f8f53c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
-Date: Sat, 23 Sep 2023 11:32:18 +0200
-Subject: [PATCH] cmake: fix when cross compiling
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In order to generate protobuf files CMake need to use the protoc
-and grpc-cpp-plugin compiled for the host architecture.
-
-Unfortunately, the protoc and grpc-cpp-plugin in the gRPC CMake
-configuration file are the one for the target architecture.
-
-Fix this by properly finding the correct executable when
-CMake is cross compiling.
-
-Signed-off-by: Clément Péron <peron.clem@gmail.com>
----
-Upstream-Status: Pending
-
- CMakeLists.txt | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5aa1310..80ebad2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -120,10 +120,34 @@ if(Protobuf_PROTOC_EXECUTABLE)
-     endif()
- endif()
- 
-+# When cross compiling we look for the native protoc compiler
-+# overwrite protobuf::protoc with the proper protoc
-+if(CMAKE_CROSSCOMPILING)
-+    find_program(Protobuf_PROTOC_EXECUTABLE REQUIRED NAMES protoc)
-+    if(NOT TARGET protobuf::protoc)
-+        add_executable(protobuf::protoc IMPORTED)
-+    endif()
-+    set_target_properties(protobuf::protoc PROPERTIES
-+        IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}")
-+endif()
-+
- find_package(gRPC QUIET)
--if(gRPC_FOUND AND TARGET gRPC::grpc AND TARGET gRPC::grpc_cpp_plugin)
-+if(gRPC_FOUND AND TARGET gRPC::grpc)
-+    # When cross compiling we look for the native grpc_cpp_plugin
-+    if(CMAKE_CROSSCOMPILING)
-+        find_program(GRPC_CPP_PLUGIN REQUIRED NAMES grpc_cpp_plugin)
-+        if(NOT TARGET gRPC::grpc_cpp_plugin)
-+            add_executable(gRPC::grpc_cpp_plugin IMPORTED)
-+        endif()
-+        set_target_properties(gRPC::grpc_cpp_plugin PROPERTIES
-+                IMPORTED_LOCATION "${GRPC_CPP_PLUGIN}")
-+    elseif(TARGET gRPC::grpc_cpp_plugin)
-+        get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION)
-+    else()
-+        message(FATAL_ERROR "Found gRPC but no gRPC CPP plugin defined")
-+    endif()
-+
-     set(GRPC_LIBRARIES gRPC::gpr gRPC::grpc gRPC::grpc++)
--    get_target_property(GRPC_CPP_PLUGIN gRPC::grpc_cpp_plugin LOCATION)
-     get_target_property(GRPC_INCLUDE_DIR gRPC::grpc INTERFACE_INCLUDE_DIRECTORIES)
- else()
-     include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGRPC.cmake)
--- 
-2.39.3 (Apple Git-145)
-
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch
new file mode 100644
index 0000000000..373e146b98
--- /dev/null
+++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-include-stdint.h-for-int64_t-types.patch
@@ -0,0 +1,27 @@
+From 44f4254fe96c43437400f94a8a2800175ddf3279 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 20 May 2024 21:00:48 -0700
+Subject: [PATCH] include stdint.h for int64_t types
+
+This is exposed when compiling for musl platforms where this
+header is not included indirectly.
+
+Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/270]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/Value.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Value.cpp b/src/Value.cpp
+index cbda697..d6f2c9c 100644
+--- a/src/Value.cpp
++++ b/src/Value.cpp
+@@ -1,4 +1,5 @@
+ #include <iomanip>
++#include <cstdint>
+ 
+ #include "etcd/Value.hpp"
+ #include "etcd/v3/KeyValue.hpp"
+-- 
+2.45.1
+
diff --git a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
index 401d53c79c..c3a5a02a3f 100644
--- a/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.3.bb
+++ b/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb
@@ -6,18 +6,24 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450"
 
 SRC_URI = " \
     git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \
-    file://0001-cmake-fix-when-cross-compiling.patch \
+    file://0001-include-stdint.h-for-int64_t-types.patch \
+    file://0001-Replacing-GPR_ASSERT-with-c-assert.patch \
 "
 
-SRCREV = "e31ac4d4caa55fa662e207150ba40f8151b7ad96"
+SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e"
 
 inherit cmake
 
 DEPENDS += "grpc protobuf cpprest grpc-native protobuf-native"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON"
 
+do_install:append() {
+        sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/cmake/etcd-cpp-api/etcd-targets.cmake
+}
+
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
+
+SKIP_RECIPE[etcd-cpp-apiv3] ?= "needs ccpprest which needs websocket does work with boost >= 1.87"
diff --git a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
index 0794158a52..dd30543a41 100644
--- a/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
+++ b/meta-oe/recipes-extended/etcd/etcd_3.5.7.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "etcd is a distributed key-value store for distributed systems"
 HOMEPAGE = "https://etcd.io/"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+LIC_FILES_CHKSUM = "file://${GO_INSTALL}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = " \
-    git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https \
-    file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=src/${GO_IMPORT} \
-    file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=src/${GO_IMPORT} \
+    git://github.com/etcd-io/etcd;branch=release-3.5;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
+    file://0001-xxhash-bump-to-v2.1.2.patch;patchdir=${GO_INSTALL} \
+    file://0001-test_lib.sh-remove-gobin-requirement-during-build.patch;patchdir=${GO_INSTALL} \
     file://etcd.service \
     file://etcd-existing.conf \
     file://etcd-new.service \
@@ -15,7 +15,6 @@ SRC_URI = " \
 "
 
 SRCREV = "215b53cf3b48ee761f4c40908b3874b2e5e95e9f"
-UPSTREAM_CHECK_COMMITS = "1"
 
 GO_IMPORT = "go.etcd.io/etcd/v3"
 GO_INSTALL = "src/${GO_IMPORT}/"
@@ -24,7 +23,7 @@ RDEPENDS:${PN}-dev = " \
     bash \
 "
 
-export GO111MODULE="on"
+export GO111MODULE = "on"
 
 inherit go systemd pkgconfig features_check
 
@@ -62,12 +61,13 @@ do_install:append() {
     install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcd ${D}${bindir}
     install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdctl ${D}${bindir}
     install -m 0755 ${D}${libdir}/go/src/go.etcd.io/etcd/v3/bin/etcdutl ${D}${bindir}
-    install -m 0644 ${WORKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d
+    install -m 0644 ${UNPACKDIR}/etcd-existing.conf -D -t ${D}${sysconfdir}/etcd.d
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/etcd.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/
-    install -m 0644 ${WORKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/etcd.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/etcd-new.service ${D}${systemd_system_unitdir}/
+    install -m 0644 ${UNPACKDIR}/etcd-new.path ${D}${systemd_system_unitdir}/
 }
 
 FILES:${PN}:append = " ${sysconfdir}/etcd.d/etcd-existing.conf"
 
+SKIP_RECIPE[etcd] ?= "QA Issue: task do_compile has network enabled"
diff --git a/meta-oe/recipes-extended/figlet/figlet_git.bb b/meta-oe/recipes-extended/figlet/figlet_git.bb
index 9789ac16d4..d226806050 100644
--- a/meta-oe/recipes-extended/figlet/figlet_git.bb
+++ b/meta-oe/recipes-extended/figlet/figlet_git.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1688bcd97b27704f1afcac7336409857"
 SRC_URI = "git://github.com/cmatsuoka/figlet.git;branch=master;protocol=https \
            file://0001-build-add-autotools-support-to-allow-easy-cross-comp.patch"
 SRCREV = "5bbcd7383a8c3a531299b216b0c734e1495c6db3"
-S = "${WORKDIR}/git"
 PV = "2.2.5+git"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
index 423c6faf7e..df7a4e2758 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb
@@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=main"
 
-SRCREV = "5ba39872f81bf8d98d58c5f8acb86604645be468"
+SRCREV = "05abdd7421688be5835a6b12f2b068086c38d4aa"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch
deleted file mode 100644
index b076a3fffd..0000000000
--- a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-for-native-wayland-scanner.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ced2e933cf647874da4baff002e0987b9bfe5fac Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Sat, 18 Nov 2023 15:07:49 +0100
-Subject: [PATCH] meson.build: require for native wayland-scanner
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5596]
----
- meson.build | 4 ++--
- 1 file changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f4e5b3a3..5d2f9eba 100644
---- a/meson.build
-+++ b/meson.build
-@@ -207,7 +207,7 @@ gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'))
- build_gtk_doc = gtkdoc_dep.found()
- 
- wayland_client = dependency('wayland-client', required : get_option('wayland_security_context'))
--wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context'))
-+wayland_scanner = dependency('wayland-scanner', version : '>= 1.15', required : get_option('wayland_security_context'), native : true)
- wayland_protocols = dependency('wayland-protocols', version : '>= 1.32', required : get_option('wayland_security_context'))
- build_wayland_security_context = wayland_client.found() and wayland_scanner.found() and wayland_protocols.found()
- 
--- 
-2.42.0
-
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch
deleted file mode 100644
index 77b60ec98c..0000000000
--- a/meta-oe/recipes-extended/flatpak/flatpak/0001-meson.build-require-native-gtkdoc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 49737b1e4a74c77a8cd7ae727974d68503da087f Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Fri, 12 Jan 2024 13:52:08 +0100
-Subject: [PATCH] meson.build: require native gtkdoc
-
-this fixes:
-| Run-time dependency gtk-doc found: NO (tried pkgconfig)
-|
-| ../git/meson.build:206:13: ERROR: Dependency "gtk-doc" not found, tried pkgconfig
-
-Upstream-Status: Submitted [https://github.com/flatpak/flatpak/pull/5650/commits/e5de3e46b917f830d7f81e9db6ed2a9b7d7db942]
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index f7f9372d..dccc3eb4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -203,7 +203,7 @@ appstream_dep = dependency('appstream', version : '>=0.12.0')
- gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
- libseccomp_dep = dependency('libseccomp', required : get_option('seccomp'))
- gir_dep = dependency('gobject-introspection-1.0', version : '>=1.40.0', required : get_option('gir'))
--gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'))
-+gtkdoc_dep = dependency('gtk-doc', required : get_option('gtkdoc'), native : true)
- build_gtk_doc = gtkdoc_dep.found()
- 
- wayland_client = dependency('wayland-client', required : get_option('wayland_security_context'))
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
index 97e57c13d5..f99c8ac36a 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.6.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.16.0.bb
@@ -4,24 +4,21 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = " \
-    gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \
+    git://github.com/flatpak/flatpak;protocol=https;branch=main \
     file://0001-flatpak-pc-add-pc_sysrootdir.patch \
-    file://0001-meson.build-require-for-native-wayland-scanner.patch \
-    file://0001-meson.build-require-native-gtkdoc.patch \
 "
 
-SRCREV = "27b11b93c2a80a91c9461bc6c7f5e9a201406041"
+SRCREV = "1440f4faa67ebf69c7559f31d2cab59e6ec6fe2b"
 
-S = "${WORKDIR}/git"
 
-inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check
+inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd
 
 REQUIRED_DISTRO_FEATURES = "polkit"
 
 DEPENDS = " \
     appstream \
     bison-native \
-    dconf \
+    bubblewrap-native \
     fuse3 \
     gdk-pixbuf \
     glib-2.0 \
@@ -33,13 +30,16 @@ DEPENDS = " \
     ostree \
     polkit \
     python3-pyparsing-native \
+    xdg-dbus-proxy-native \
     zstd \
 "
 
 RDEPENDS:${PN} = " \
     ca-certificates \
-    dconf \
     flatpak-xdg-utils \
+    fuse3-utils \
+    bubblewrap \
+    xdg-dbus-proxy \
 "
 
 GIR_MESON_OPTION = "gir"
@@ -50,12 +50,14 @@ GTKDOC_MESON_ENABLE_FLAG = 'enabled'
 GTKDOC_MESON_DISABLE_FLAG = 'disabled'
 
 PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl"
+PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf"
 PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native"
 PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native"
 PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4"
 PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native"
 PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth"
 PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp"
+PACKAGECONFIG[malcontent] = "-Dmalcontent=enabled,-Dmalcontent=disabled,malcontent"
 PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,libselinux"
 PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols"
 
@@ -66,13 +68,13 @@ PACKAGECONFIG ?= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \
 "
 
-FILES:${PN} += "${libdir} ${datadir}"
+EXTRA_OEMESON = " \
+    -Dsystem_fusermount=fusermount3 \
+    -Dsystem_bubblewrap=bwrap \
+    -Dsystem_dbus_proxy=xdg-dbus-proxy \
+"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd"
+USERADD_PARAM:${PN} = "--system --no-create-home --user-group --shell /sbin/nologin flatpak"
 
-do_install:append() {
-    chmod 0700 ${D}/${datadir}/polkit-1/rules.d
-    chown polkitd ${D}/${datadir}/polkit-1/rules.d
-    chgrp root ${D}/${datadir}/polkit-1/rules.d
-}
+FILES:${PN} += "${libdir} ${datadir}"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
deleted file mode 100644
index f5a1716c07..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6a704ab7bf69cd5d6970b3a7d3ae7798b26027c1 Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Thu, 28 Jul 2022 11:28:41 +0200
-Subject: [PATCH] CMakeLists.txt Do not use private makefile $< target
-
-$< is a private detail from the Makefile generated by CMakefile and
-are not under control or to be used at the CMakeLists level. In 3.20
-that private generation changed pre-requisite targets[1] and now logs
-contain the path compiler_depend.ts instead of the actual file.
-
-Upstream-Status: Pending [https://github.com/fluent/fluent-bit/issues/5492]
----
- CMakeLists.txt              | 6 +-----
- lib/chunkio/CMakeLists.txt  | 7 +------
- lib/cmetrics/CMakeLists.txt | 7 +------
- 3 files changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3dba5a8..d94b988 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,11 +46,7 @@ else()
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
- endif()
- 
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
--else()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
--endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
-   set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -latomic")
-diff --git a/lib/chunkio/CMakeLists.txt b/lib/chunkio/CMakeLists.txt
-index bbe1f39..809ea93 100644
---- a/lib/chunkio/CMakeLists.txt
-+++ b/lib/chunkio/CMakeLists.txt
-@@ -14,12 +14,7 @@ else()
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ")
- endif()
- 
--# Set __FILENAME__
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
--else()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
--endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- include(cmake/macros.cmake)
- 
-diff --git a/lib/cmetrics/CMakeLists.txt b/lib/cmetrics/CMakeLists.txt
-index 60e8774..e3d6149 100644
---- a/lib/cmetrics/CMakeLists.txt
-+++ b/lib/cmetrics/CMakeLists.txt
-@@ -34,12 +34,7 @@ set(CMT_VERSION_MINOR  3)
- set(CMT_VERSION_PATCH  5)
- set(CMT_VERSION_STR "${CMT_VERSION_MAJOR}.${CMT_VERSION_MINOR}.${CMT_VERSION_PATCH}")
- 
--# Define __FILENAME__ consistently across Operating Systems
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
--else()
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
--endif()
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
- 
- # Configuration options
- option(CMT_DEV             "Enable development mode"                   No)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
deleted file mode 100644
index 8d89e4df35..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-Use-posix-strerror_r-with-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f645128082117a0152a95b3dccd869a184b7513f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 10 Aug 2022 01:23:48 -0700
-Subject: [PATCH 1/2] Use posix strerror_r with musl
-
-Default with glibc is GNU extention of strerror_r
-where as musl uses posix variant, call that out
-
-Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/flb_network.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/flb_network.c b/src/flb_network.c
-index 992eb1d..5d7a337 100644
---- a/src/flb_network.c
-+++ b/src/flb_network.c
-@@ -506,7 +506,12 @@ static int net_connect_async(int fd,
-             }
- 
-             /* Connection is broken, not much to do here */
-+#ifdef __GLIBC__
-             str = strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+#else
-+            strerror_r(error, so_error_buf, sizeof(so_error_buf));
-+           str = so_error_buf;
-+#endif
-             flb_error("[net] TCP connection failed: %s:%i (%s)",
-                       u->tcp_host, u->tcp_port, str);
-             return -1;
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
new file mode 100644
index 0000000000..32f4fdec51
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch
@@ -0,0 +1,95 @@
+From 7e6295f14ea057562a235fbf6762d867e739a181 Mon Sep 17 00:00:00 2001
+From: Niko Mauno <niko.mauno@vaisala.com>
+Date: Sun, 29 Sep 2024 12:00:00 +0000
+Subject: [PATCH] lib: Do not use private makefile targets in CMakelists.txt
+
+By extending the scope of changes introduced in commit
+fc325524d50fe179b76f127243ab9e03ddbdaaa4
+("build: CMakeLists.txt Do not use private makefile targets (#5819)")
+we mitigate the following error produced by BitBake in Yocto
+
+  ERROR: fluentbit-3.1.9-r0 do_package_qa: QA Issue: File /usr/bin/fluent-bit in package fluentbit contains reference to TMPDIR [buildpaths]
+  ERROR: fluentbit-3.1.9-r0 do_package_qa: Fatal QA errors were found, failing task.
+
+stemming from
+
+  $ strings packages-split/fluentbit/usr/bin/fluent-bit
+  ...
+  $(subst /yocto/upstream/build/tmp/work/cortexa57-poky-linux/fluentbit/3.1.9/git/,,$(abspath $<))
+  ...
+
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+
+Upstream-Status: Submitted [https://github.com/fluent/fluent-bit/pull/9450]
+---
+ lib/cfl/CMakeLists.txt      | 8 ++------
+ lib/cmetrics/CMakeLists.txt | 8 ++------
+ lib/ctraces/CMakeLists.txt  | 8 ++------
+ lib/monkey/CMakeLists.txt   | 4 +---
+ 4 files changed, 7 insertions(+), 21 deletions(-)
+
+--- a/lib/cfl/CMakeLists.txt
++++ b/lib/cfl/CMakeLists.txt
+@@ -40,12 +40,8 @@ if(NOT MSVC)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+ 
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++# Define __FILENAME__
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ 
+ 
+--- a/lib/cmetrics/CMakeLists.txt
++++ b/lib/cmetrics/CMakeLists.txt
+@@ -60,12 +60,8 @@ if(NOT MSVC)
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ endif()
+ 
+-# Define __CMT_FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
+-endif()
++# Define __CMT_FILENAME__
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__CMT_FILENAME__=__FILE__")
+ 
+ # Configuration options
+ option(CMT_DEV                       "Enable development mode"                   No)
+--- a/lib/ctraces/CMakeLists.txt
++++ b/lib/ctraces/CMakeLists.txt
+@@ -30,12 +30,8 @@ set(CTR_VERSION_MINOR  6)
+ set(CTR_VERSION_PATCH  4)
+ set(CTR_VERSION_STR "${CTR_VERSION_MAJOR}.${CTR_VERSION_MINOR}.${CTR_VERSION_PATCH}")
+ 
+-# Define __FILENAME__ consistently across Operating Systems
+-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath $$<))\"'")
+-else()
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+-endif()
++# Define __FILENAME__
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ # Configuration options
+ option(CTR_DEV             "Enable development mode"                   No)
+--- a/lib/monkey/CMakeLists.txt
++++ b/lib/monkey/CMakeLists.txt
+@@ -15,10 +15,8 @@ include(GNUInstallDirs)
+ # Set default compiler options
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$$(subst ${CMAKE_SOURCE_DIR}/,,$$(abspath \$$<))\"'")
+-else()
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ endif()
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__=__FILE__")
+ 
+ # Monkey Version
+ set(MK_VERSION_MAJOR  1)
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
deleted file mode 100644
index e70664031b..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0d22024c5defba7007e3e633753790e20209c6f6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 09:59:41 -0700
-Subject: [PATCH 1/5] monkey: Define _GNU_SOURCE for memmem API check
-
-This define is necessary to get this API on glibc based systems
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/monkey/mk_core/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/monkey/mk_core/CMakeLists.txt b/lib/monkey/mk_core/CMakeLists.txt
-index 0e74f8d..739fff3 100644
---- a/lib/monkey/mk_core/CMakeLists.txt
-+++ b/lib/monkey/mk_core/CMakeLists.txt
-@@ -62,6 +62,7 @@ set(src "${src}"
-   )
- 
- check_c_source_compiles("
-+  #define _GNU_SOURCE
-   #include <string.h>
-   int main() {
-      char  haystack[] = \"1234\";
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
index 425b838b78..025f8729ea 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch
@@ -1,4 +1,4 @@
-From 71dab751a27a2e582b711de22873065dd28f4b65 Mon Sep 17 00:00:00 2001
+From c8c9dd3aeb49ab2ec94c3ab081e2368736a5da20 Mon Sep 17 00:00:00 2001
 From: Paulo Neves <ptsneves@gmail.com>
 Date: Thu, 28 Jul 2022 11:42:31 +0200
 Subject: [PATCH] flb_info.h.in: Do not hardcode compilation directories
@@ -13,8 +13,6 @@ Upstream-Status: Pending
  include/fluent-bit/flb_info.h.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/include/fluent-bit/flb_info.h.in b/include/fluent-bit/flb_info.h.in
-index a89485c..2579afc 100644
 --- a/include/fluent-bit/flb_info.h.in
 +++ b/include/fluent-bit/flb_info.h.in
 @@ -23,7 +23,7 @@
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
deleted file mode 100644
index d911420df2..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-mbedtls-Remove-unused-variable.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c7b969d1a2a6b61bd179214ee2516b7b6cd55b27 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:21:57 -0700
-Subject: [PATCH 2/5] mbedtls: Remove unused variable
-
-Fixes
-library/bignum.c:1395:29: error: variable 't' set but not used [-Werror,-Wunused-but-set-variable]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- lib/mbedtls-2.28.0/library/bignum.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/mbedtls-2.28.0/library/bignum.c b/lib/mbedtls-2.28.0/library/bignum.c
-index 62e7f76..9c256ae 100644
---- a/lib/mbedtls-2.28.0/library/bignum.c
-+++ b/lib/mbedtls-2.28.0/library/bignum.c
-@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
-                   mbedtls_mpi_uint *d,
-                   mbedtls_mpi_uint b )
- {
--    mbedtls_mpi_uint c = 0, t = 0;
-+    mbedtls_mpi_uint c = 0;
- 
- #if defined(MULADDC_HUIT)
-     for( ; i >= 8; i -= 8 )
-@@ -1443,8 +1443,6 @@ void mpi_mul_hlp( size_t i,
-     }
- #endif /* MULADDC_HUIT */
- 
--    t++;
--
-     while( c != 0 )
-     {
-         *d += c; c = ( *d < c ); d++;
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
new file mode 100644
index 0000000000..909d1be28d
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-CMakeLists.txt-Revise-init-manager-deduction.patch
@@ -0,0 +1,36 @@
+From bf4e832544e8aa5866ef57859f95b71bd8811154 Mon Sep 17 00:00:00 2001
+From: Niko Mauno <niko.mauno@vaisala.com>
+Date: Mon, 21 Oct 2024 16:02:46 +0000
+Subject: [PATCH] CMakeLists.txt: Revise init manager deduction
+
+The init manager deduction is not cross-compile friendly, so replace
+the host specific condition checks with placeholders that can be
+replaced in Yocto recipe.
+
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+
+Upstream-Status: Inappropriate [configuration]
+---
+ src/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -569,7 +569,7 @@ if(FLB_BINARY)
+     set(SYSTEMD_UNITDIR  /lib/systemd/system)
+   endif()
+ 
+-  if(SYSTEMD_UNITDIR)
++  if(@INIT_MANAGER_IS_SYSTEMD@)
+     if (FLB_AMAZON_LINUX2)
+       set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
+       configure_file(
+@@ -594,7 +594,7 @@ if(FLB_BINARY)
+       install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
+       install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
+     endif()
+-  elseif(IS_DIRECTORY /usr/share/upstart)
++  elseif(@INIT_MANAGER_IS_UPSTART@)
+     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
+     configure_file(
+       "${PROJECT_SOURCE_DIR}/init/upstart.in"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
deleted file mode 100644
index 473ebaf7d4..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Disable-documentation-warning-as-error-with-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2d12629f768d2459b1fc8a8ca0c38024d84bc195 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:32:12 -0700
-Subject: [PATCH 3/5] mbedtls: Disable documentation warning as error with
- clang
-
-There are shortcomings with doxygen info which clang-15+ flags, dont
-treat them as errors
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- lib/mbedtls-2.28.0/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/mbedtls-2.28.0/CMakeLists.txt b/lib/mbedtls-2.28.0/CMakeLists.txt
-index b33c088..c5f886f 100644
---- a/lib/mbedtls-2.28.0/CMakeLists.txt
-+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
-@@ -212,7 +212,7 @@ if(CMAKE_COMPILER_IS_GNU)
- endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
-+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral -Wno-error=documentation")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
deleted file mode 100644
index 158857ae20..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0003-mbedtls-Do-not-overwrite-CFLAGS.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8486b912281ae85db0c9fc05bb546f16872e114c Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Thu, 28 Jul 2022 14:37:18 +0200
-Subject: [PATCH] mbedtls: Do not overwrite CFLAGS
-
-bitbake passes CFLAGS that are often in conflict with the ones set
-in mbedtls' CMakeLists.txt. Such conflicts are the inability to use
-FORTIFY_SOURCE=2 except in release mode
-
-Upstream-Status: Inappropriate [due to fluent-bit having it's own Release flags that also overwrite bitbake ones.]
----
- lib/mbedtls-2.28.0/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/lib/mbedtls-2.28.0/CMakeLists.txt
-+++ b/lib/mbedtls-2.28.0/CMakeLists.txt
-@@ -204,8 +204,6 @@ if(CMAKE_COMPILER_IS_GNU)
-     if (GCC_VERSION VERSION_GREATER 7.0 OR GCC_VERSION VERSION_EQUAL 7.0)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat-overflow=2 -Wformat-truncation")
-     endif()
--    set(CMAKE_C_FLAGS_RELEASE     "-O2")
--    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
-@@ -215,8 +213,6 @@ endif(CMAKE_COMPILER_IS_GNU)
- 
- if(CMAKE_COMPILER_IS_CLANG)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -Wvla -Wformat=2 -Wno-format-nonliteral")
--    set(CMAKE_C_FLAGS_RELEASE     "-O2")
--    set(CMAKE_C_FLAGS_DEBUG       "-O0 -g3")
-     set(CMAKE_C_FLAGS_COVERAGE    "-O0 -g3 --coverage")
-     set(CMAKE_C_FLAGS_ASAN        "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3")
-     set(CMAKE_C_FLAGS_ASANDBG     "-fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
deleted file mode 100644
index bd4276193d..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a797b79483940ed4adcaa5fe2c40dd0487c7c2c7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:39:08 -0700
-Subject: [PATCH 4/5] Use correct type to store return from flb_kv_item_create
-
-Fix
-error: incompatible pointer to integer conversion assigning to 'int' from 'struct flb_kv *'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- plugins/out_stackdriver/stackdriver_conf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/out_stackdriver/stackdriver_conf.c b/plugins/out_stackdriver/stackdriver_conf.c
-index a9a8eb0..e4f969e 100644
---- a/plugins/out_stackdriver/stackdriver_conf.c
-+++ b/plugins/out_stackdriver/stackdriver_conf.c
-@@ -176,12 +176,12 @@ static int read_credentials_file(const char *cred_file, struct flb_stackdriver *
- 
- static int parse_configuration_labels(struct flb_stackdriver *ctx)
- {
--    int ret;
-     char *p;
-     flb_sds_t key;
-     flb_sds_t val;
-     struct mk_list *head;
-     struct flb_slist_entry *entry;
-+    struct flb_kv *ret;
-     msgpack_object_kv *kv = NULL;
- 
-     if (ctx->labels) {
-@@ -216,7 +216,7 @@ static int parse_configuration_labels(struct flb_stackdriver *ctx)
-             flb_sds_destroy(key);
-             flb_sds_destroy(val);
- 
--            if (ret == -1) {
-+            if (!ret) {
-                 return -1;
-             }
-         }
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
deleted file mode 100644
index f6e3dce2f3..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0004-build-Make-systemd-init-systemd-detection-contingent.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7a792624925d46690c1f07fe4b194b5f4c510db6 Mon Sep 17 00:00:00 2001
-From: Paulo Neves <ptsneves@gmail.com>
-Date: Tue, 2 Aug 2022 09:57:05 +0200
-Subject: [PATCH 1/1] build: Make systemd init systemd detection contingent on
- pkgconfig
-
-Use pkg-config to get systemd.pc variables and systemdunitdir. Those
-variable ensure that .service files are installed in the correct paths
-and only when systemd is detected.
-
-Upstream-Status: Pending [https://github.com/fluent/fluent-bit/pull/5818]
-
----
- cmake/FindJournald.cmake | 4 ++++
- src/CMakeLists.txt       | 4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
-index f5a3a832b..9e6657a29 100644
---- a/cmake/FindJournald.cmake
-+++ b/cmake/FindJournald.cmake
-@@ -5,6 +5,8 @@
- #  JOURNALD_INCLUDE_DIR - the Journald include directory
- #  JOURNALD_LIBRARIES - Link these to use Journald
- #  JOURNALD_DEFINITIONS - Compiler switches required for using Journald
-+#  SYSTEMD_UNITDIR - The systemd units' directory
-+#
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- #
-@@ -16,7 +18,9 @@
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_JOURNALD QUIET systemd)
-+pkg_get_variable(PC_SYSTEMD_UNITDIR systemd "systemdsystemunitdir")
- 
-+set(SYSTEMD_UNITDIR ${PC_SYSTEMD_UNITDIR})
- set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
- set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 522bbf9bd..30743d8d6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -480,13 +480,13 @@ if(FLB_BINARY)
-   endif()
- 
-   # Detect init system, install upstart, systemd or init.d script
--  if(IS_DIRECTORY /lib/systemd/system)
-+  if(DEFINED SYSTEMD_UNITDIR)
-     set(FLB_SYSTEMD_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.service")
-     configure_file(
-       "${PROJECT_SOURCE_DIR}/init/systemd.in"
-       ${FLB_SYSTEMD_SCRIPT}
-       )
--    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION /lib/systemd/system)
-+    install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
-   elseif(IS_DIRECTORY /usr/share/upstart)
-     set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
index bdcc534964..c34a0ba71d 100644
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-chunkio-Link-with-fts-library-with-musl.patch
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0004-chunkio-Link-with-fts-library-with-musl.patch
@@ -1,7 +1,7 @@
-From 63dbbad5978e5f5b0e7d42614999cb6b4ebcce10 Mon Sep 17 00:00:00 2001
+From a07df56092e529627db0946c025cb4964567280c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 10 Aug 2022 01:27:16 -0700
-Subject: [PATCH 2/2] chunkio: Link with fts library with musl
+Subject: [PATCH] chunkio: Link with fts library with musl
 
 Fixes
 cio_utils.c:(.text+0x64): undefined reference to `fts_read'
@@ -14,10 +14,10 @@ Upstream-Status: Pending
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/chunkio/src/CMakeLists.txt b/lib/chunkio/src/CMakeLists.txt
-index a4fc2d3..4244eb8 100644
+index bb52273d4..524500919 100644
 --- a/lib/chunkio/src/CMakeLists.txt
 +++ b/lib/chunkio/src/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(src
+@@ -14,6 +14,7 @@ set(src
    )
  
  set(libs cio-crc32)
@@ -25,6 +25,3 @@ index a4fc2d3..4244eb8 100644
  
  if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
    set(src
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
new file mode 100644
index 0000000000..281bf66fb9
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-Use-posix-strerror_r-with-musl.patch
@@ -0,0 +1,31 @@
+From 0c4310483875509f464883fa345f54e0d3ae25a5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 10 Aug 2022 01:23:48 -0700
+Subject: [PATCH] Use posix strerror_r with musl
+
+Default with glibc is GNU extention of strerror_r
+where as musl uses posix variant, call that out
+
+Upstream-Status: Inappropriate [Need wider porting beyond linux/musl/glibc]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Resolved conflicts while upgrading recipe from v1.9.9 to v3.1.9.
+
+Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
+---
+ src/flb_network.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/flb_network.c b/src/flb_network.c
+index 8f8ca33f6..dd098a2ea 100644
+--- a/src/flb_network.c
++++ b/src/flb_network.c
+@@ -605,7 +605,7 @@ static int net_connect_async(int fd,
+             /* Connection is broken, not much to do here */
+ #if ((defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) ||    \
+      (defined(_XOPEN_SOURCE) || _XOPEN_SOURCE - 0L >= 600L)) &&     \
+-  (!defined(_GNU_SOURCE))
++  (!defined(_GNU_SOURCE)) || (!defined(__GLIBC__))
+             ret = strerror_r(error, so_error_buf, sizeof(so_error_buf));
+             if (ret == 0) {
+                 str = so_error_buf;
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
deleted file mode 100644
index f023ab5732..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0005-stackdriver-Fix-return-type-mismatch.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27f0bd5a3339612e03112e6b490900a9fabc3337 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 11:44:25 -0700
-Subject: [PATCH 5/5] stackdriver: Fix return type mismatch
-
-Fix
-error: incompatible integer to pointer conversion returning 'int' from a function with result type 'flb_sds_t' (aka 'char *') [-Wint-conversion]
-            return -1;
-                   ^~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- plugins/out_stackdriver/stackdriver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/out_stackdriver/stackdriver.c b/plugins/out_stackdriver/stackdriver.c
-index ae66bf2..e01755c 100644
---- a/plugins/out_stackdriver/stackdriver.c
-+++ b/plugins/out_stackdriver/stackdriver.c
-@@ -2033,7 +2033,7 @@ static flb_sds_t stackdriver_format(struct flb_stackdriver *ctx,
-             flb_sds_destroy(operation_producer);
-             msgpack_unpacked_destroy(&result);
-             msgpack_sbuffer_destroy(&mp_sbuf);
--            return -1;
-+            return NULL; 
-         }
- 
-         /* Number of parsed labels */
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
deleted file mode 100644
index c3f2574d26..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0006-monkey-Fix-TLS-detection-testcase.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f88d9b82e8bd8ae38fba666b5825ffb41769f81a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 12:25:22 -0700
-Subject: [PATCH] monkey: Fix TLS detection testcase
-
-Clang15 errors out on compiling the check and disables TLS
-
-Fixes errors like
-
-error: call to undeclared function '__tls_get_addr'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-         __tls_get_addr(0);
-         ^
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- lib/monkey/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/monkey/CMakeLists.txt b/lib/monkey/CMakeLists.txt
-index 15e62e8..96ac2bd 100644
---- a/lib/monkey/CMakeLists.txt
-+++ b/lib/monkey/CMakeLists.txt
-@@ -178,6 +178,8 @@ endif()
- # Use old Pthread TLS
- if(NOT MK_PTHREAD_TLS)
-   check_c_source_compiles("
-+     #include <sys/types.h>
-+     extern void *__tls_get_addr(size_t *v);
-      __thread int a;
-      int main() {
-          __tls_get_addr(0);
--- 
-2.37.1
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
deleted file mode 100644
index 71bdd34eeb..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit/0007-cmake-Do-not-check-for-upstart-on-build-host.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c41653e856d05ed430d22f8b311714ff756a0e0b Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 23 Mar 2023 18:05:27 -0700
-Subject: [PATCH] cmake: Do not check for upstart on build host
-
-Some ubuntu distros might have this directory /usr/share/upstart around
-and yocto based distros not using systemd will process this piece of
-code and falsely assume that target supports upstart, which may not be
-true in case of cross-compilation.
-
-This also can end up in configure errors e.g.
-
-| CMake Error at src/CMakeLists.txt:496 (install):
-|   install DIRECTORY given unknown argument "/etc/td-agent-bit/".
-|
-|
-| -- Configuring incomplete, errors occurred!
-
-Upstream-Status: Inappropriate [ Cross-compile Specific ]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bb30b2a..c63b6d8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -486,14 +486,6 @@ if(FLB_BINARY)
-       )
-     install(FILES ${FLB_SYSTEMD_SCRIPT} COMPONENT binary DESTINATION ${SYSTEMD_UNITDIR})
-     install(DIRECTORY DESTINATION ${FLB_INSTALL_CONFDIR} COMPONENT binary)
--  elseif(IS_DIRECTORY /usr/share/upstart)
--    set(FLB_UPSTART_SCRIPT "${PROJECT_SOURCE_DIR}/init/${FLB_OUT_NAME}.conf")
--    configure_file(
--      "${PROJECT_SOURCE_DIR}/init/upstart.in"
--      ${FLB_UPSTART_SCRIPT}
--      )
--    install(FILES ${FLB_UPSTART_SCRIPT} COMPONENT binary DESTINATION /etc/init)
--    install(DIRECTORY DESTINATION COMPONENT binary ${FLB_INSTALL_CONFDIR})
-   else()
-     # FIXME: should we support Sysv init script ?
-   endif()
--- 
-2.40.0
-
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
deleted file mode 100644
index fc06095475..0000000000
--- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.7.bb
+++ /dev/null
@@ -1,92 +0,0 @@
-SUMMARY = "Fast Log processor and Forwarder"
-DESCRIPTION = "Fluent Bit is a data collector, processor and  \
-forwarder for Linux. It supports several input sources and \
-backends (destinations) for your data. \
-"
-
-HOMEPAGE = "http://fluentbit.io"
-BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-SECTION = "net"
-
-SRC_URI = "https://releases.fluentbit.io/1.9/source-${PV}.tar.gz;subdir=fluent-bit-${PV};downloadfilename=${BPN}-${PV}.tar.gz \
-           file://0001-CMakeLists.txt-Do-not-use-private-makefile-target.patch \
-           file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
-           file://0003-mbedtls-Do-not-overwrite-CFLAGS.patch \
-           file://0004-build-Make-systemd-init-systemd-detection-contingent.patch \
-           file://0001-monkey-Define-_GNU_SOURCE-for-memmem-API-check.patch \
-           file://0002-mbedtls-Remove-unused-variable.patch \
-           file://0003-mbedtls-Disable-documentation-warning-as-error-with-.patch \
-           file://0004-Use-correct-type-to-store-return-from-flb_kv_item_cr.patch \
-           file://0005-stackdriver-Fix-return-type-mismatch.patch \
-           file://0006-monkey-Fix-TLS-detection-testcase.patch \
-           file://0007-cmake-Do-not-check-for-upstart-on-build-host.patch \
-           "
-SRC_URI:remove:x86 = "file://0002-mbedtls-Remove-unused-variable.patch"
-SRC_URI:append:libc-musl = "\
-           file://0001-Use-posix-strerror_r-with-musl.patch \
-           file://0002-chunkio-Link-with-fts-library-with-musl.patch \
-           "
-SRC_URI[sha256sum] = "8ca2ac081d7eee717483c06608adcb5e3d5373e182ad87dba21a23f8278c6540"
-S = "${WORKDIR}/fluent-bit-${PV}"
-
-DEPENDS = "zlib bison-native flex-native openssl"
-DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
-
-PACKAGECONFIG[yaml] = "-DFLB_CONFIG_YAML=On,-DFLB_CONFIG_YAML=Off,libyaml"
-PACKAGECONFIG[kafka] = "-DFLB_OUT_KAFKA=On,-DFLB_OUT_KAFKA=Off,librdkafka"
-PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=On,-DFLB_EXAMPLES=Off"
-PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=On,-DFLB_JEMALLOC=Off,jemalloc"
-#TODO add more fluentbit options to PACKAGECONFIG[]
-
-DEPENDS:append:libc-musl = " fts "
-
-# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
-do_compile:append() {
-    find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
-}
-
-PACKAGECONFIG ?= "yaml"
-
-LTO = ""
-
-# Use CMake 'Unix Makefiles' generator
-OECMAKE_GENERATOR ?= "Unix Makefiles"
-
-# Fluent Bit build options
-# ========================
-
-# Host related setup
-EXTRA_OECMAKE += "-DGNU_HOST=${HOST_SYS} -DFLB_TD=1"
-
-# Disable LuaJIT and filter_lua support
-EXTRA_OECMAKE += "-DFLB_LUAJIT=Off -DFLB_FILTER_LUA=Off "
-
-# Disable Library and examples
-EXTRA_OECMAKE += "-DFLB_SHARED_LIB=Off"
-
-# Enable systemd iff systemd is in DISTRO_FEATURES
-EXTRA_OECMAKE += "${@bb.utils.contains('DISTRO_FEATURES','systemd','-DFLB_SYSTEMD=On','-DFLB_SYSTEMD=Off',d)}"
-
-# Enable release builds
-EXTRA_OECMAKE += "-DFLB_RELEASE=On"
-
-# musl needs these options
-EXTRA_OECMAKE:append:libc-musl = ' -DFLB_JEMALLOC_OPTIONS="--with-jemalloc-prefix=je_ --with-lg-quantum=3" -DFLB_CORO_STACK_SIZE=24576'
-
-EXTRA_OECMAKE:append:riscv64 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:riscv32 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:mips = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:powerpc = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-EXTRA_OECMAKE:append:x86 = " -DCMAKE_C_STANDARD_LIBRARIES=-latomic"
-
-CFLAGS:append:x86 = " -DMBEDTLS_HAVE_SSE2"
-
-inherit cmake systemd pkgconfig
-
-SYSTEMD_SERVICE:${PN} = "td-agent-bit.service"
-
-EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
-TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}"
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
new file mode 100644
index 0000000000..05e4fd937f
--- /dev/null
+++ b/meta-oe/recipes-extended/fluentbit/fluentbit_4.0.1.bb
@@ -0,0 +1,151 @@
+SUMMARY = "Fast Log Processor and Forwarder"
+DESCRIPTION = "Fluent Bit allows to collect log events or metrics from \
+different sources, process them and deliver them to different backends \
+such as Fluentd, Elasticsearch, Splunk, DataDog, Kafka, New Relic, Azure \
+services, AWS services, Google services, NATS, InfluxDB or any custom \
+HTTP end-point."
+HOMEPAGE = "http://fluentbit.io"
+BUGTRACKER = "https://github.com/fluent/fluent-bit/issues"
+SECTION = "net"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
+DEPENDS = "\
+    bison-native \
+    flex-native \
+    openssl \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+"
+DEPENDS:append:libc-musl = " fts"
+
+SRCREV = "b12e507090273576d1156342780c7c6d358fa579"
+SRC_URI = "\
+    git://github.com/fluent/fluent-bit.git;branch=master;protocol=https \
+    file://0001-lib-Do-not-use-private-makefile-targets-in-CMakelist.patch \
+    file://0002-flb_info.h.in-Do-not-hardcode-compilation-directorie.patch \
+    file://0003-CMakeLists.txt-Revise-init-manager-deduction.patch \
+"
+SRC_URI:append:libc-musl = "\
+    file://0004-chunkio-Link-with-fts-library-with-musl.patch \
+    file://0005-Use-posix-strerror_r-with-musl.patch \
+"
+
+# prefix tag with "v" to avoid upgrade to random tags like "20220215"
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
+
+
+PACKAGECONFIG ??= "\
+    aws \
+    binary \
+    config-yaml \
+    custom-calyptia \
+    http-server \
+    inotify \
+    ipo \
+    metrics \
+    parser \
+    prefer-system-libs \
+    profiles \
+    proxy-go \
+    record-accessor \
+    regex \
+    signv4 \
+    sqldb \
+    stream-processor \
+    tls \
+    utf8-encoder \
+"
+# See https://github.com/fluent/fluent-bit/issues/7248#issuecomment-1631280496
+PACKAGECONFIG:remove:toolchain-clang = "ipo"
+
+# Use system libs
+PACKAGECONFIG[prefer-system-libs] = "-DFLB_PREFER_SYSTEM_LIBS=Yes,-DFLB_PREFER_SYSTEM_LIBS=No, nghttp2 c-ares"
+DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs backtrace', 'libbacktrace', '', d)}"
+DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs jemalloc', 'jemalloc', '', d)}"
+DEPENDS += " ${@bb.utils.contains('PACKAGECONFIG', 'prefer-system-libs luajit', 'luajit', '', d)}"
+
+PACKAGECONFIG[all] = "-DFLB_ALL=Yes,-DFLB_ALL=No"
+PACKAGECONFIG[arrow] = "-DFLB_ARROW=Yes,-DFLB_ARROW=No"
+PACKAGECONFIG[avro-encoder] = "-DFLB_AVRO_ENCODER=Yes,-DFLB_AVRO_ENCODER=No"
+PACKAGECONFIG[aws-error-reporter] = "-DFLB_AWS_ERROR_REPORTER=Yes,-DFLB_AWS_ERROR_REPORTER=No"
+PACKAGECONFIG[aws] = "-DFLB_AWS=Yes,-DFLB_AWS=No"
+PACKAGECONFIG[backtrace] = "-DFLB_BACKTRACE=Yes,-DFLB_BACKTRACE=No"
+PACKAGECONFIG[binary] = "-DFLB_BINARY=Yes,-DFLB_BINARY=No"
+PACKAGECONFIG[chunk-trace] = "-DFLB_CHUNK_TRACE=Yes,-DFLB_CHUNK_TRACE=No"
+PACKAGECONFIG[config-yaml] = "-DFLB_CONFIG_YAML=Yes,-DFLB_CONFIG_YAML=No,libyaml"
+PACKAGECONFIG[custom-calyptia] = "-DFLB_CUSTOM_CALYPTIA=Yes,-DFLB_CUSTOM_CALYPTIA=No"
+PACKAGECONFIG[enforce-alignment] = "-DFLB_ENFORCE_ALIGNMENT=Yes,-DFLB_ENFORCE_ALIGNMENT=No"
+PACKAGECONFIG[examples] = "-DFLB_EXAMPLES=Yes,-DFLB_EXAMPLES=No"
+PACKAGECONFIG[http-client-debug] = "-DFLB_HTTP_CLIENT_DEBUG=Yes,-DFLB_HTTP_CLIENT_DEBUG=No"
+PACKAGECONFIG[http-server] = "-DFLB_HTTP_SERVER=Yes,-DFLB_HTTP_SERVER=No"
+PACKAGECONFIG[inotify] = "-DFLB_INOTIFY=Yes,-DFLB_INOTIFY=No"
+PACKAGECONFIG[ipo] = "-DFLB_IPO=Yes,-DFLB_IPO=no"
+PACKAGECONFIG[jemalloc] = "-DFLB_JEMALLOC=Yes,-DFLB_JEMALLOC=No,jemalloc"
+PACKAGECONFIG[luajit] = "-DFLB_LUAJIT=Yes,-DFLB_LUAJIT=No"
+PACKAGECONFIG[metrics] = "-DFLB_METRICS=Yes,-DFLB_METRICS=No"
+PACKAGECONFIG[mtrace] = "-DFLB_MTRACE=Yes,-DFLB_MTRACE=No"
+PACKAGECONFIG[parser] = "-DFLB_PARSER=Yes,-DFLB_PARSER=No"
+PACKAGECONFIG[posix-tls] = "-DFLB_POSIX_TLS=Yes,-DFLB_POSIX_TLS=No"
+PACKAGECONFIG[profiles] = "-DFLB_PROFILES=Yes,-DFLB_PROFILES=No"
+PACKAGECONFIG[proxy-go] = "-DFLB_PROXY_GO=Yes,-DFLB_PROXY_GO=No"
+PACKAGECONFIG[record-accessor] = "-DFLB_RECORD_ACCESSOR=Yes,-DFLB_RECORD_ACCESSOR=No"
+PACKAGECONFIG[regex] = "-DFLB_REGEX=Yes,-DFLB_REGEX=No"
+PACKAGECONFIG[run-ldconfig] = "-DFLB_RUN_LDCONFIG=Yes,-DFLB_RUN_LDCONFIG=No"
+PACKAGECONFIG[shared-lib] = "-DFLB_SHARED_LIB=Yes,-DFLB_SHARED_LIB=No"
+PACKAGECONFIG[signv4] = "-DFLB_SIGNV4=Yes,-DFLB_SIGNV4=No"
+PACKAGECONFIG[sqldb] = "-DFLB_SQLDB=Yes,-DFLB_SQLDB=No"
+PACKAGECONFIG[stream-processor] = "-DFLB_STREAM_PROCESSOR=Yes,-DFLB_STREAM_PROCESSOR=No"
+PACKAGECONFIG[tests-runtime] = "-DFLB_TESTS_RUNTIME=Yes,-DFLB_TESTS_RUNTIME=No"
+PACKAGECONFIG[tls] = "-DFLB_TLS=Yes,-DFLB_TLS=No"
+PACKAGECONFIG[trace] = "-DFLB_TRACE=Yes,-DFLB_TRACE=No"
+PACKAGECONFIG[utf8-encoder] = "-DFLB_UTF8_ENCODER=Yes,-DFLB_UTF8_ENCODER=No"
+PACKAGECONFIG[valgrind] = "-DFLB_VALGRIND=Yes,-DFLB_VALGRIND=No,valgrind"
+PACKAGECONFIG[wamrc] = "-DFLB_WAMRC=Yes,-DFLB_WAMRC=No"
+PACKAGECONFIG[wasm-stack-protect] = "-DFLB_WASM_STACK_PROTECT=Yes,-DFLB_WASM_STACK_PROTECT=No"
+PACKAGECONFIG[wasm] = "-DFLB_WASM=Yes,-DFLB_WASM=No"
+PACKAGECONFIG[windows-defaults] = "-DFLB_WINDOWS_DEFAULTS=Yes,-DFLB_WINDOWS_DEFAULTS=No"
+
+# Option to disable all Fluent Bit plugins by default. See cmake/plugins_options.cmake which
+# individual plugins then to enable (e.g. using EXTRA_OECMAKE:append = " -DFLB_FOOBAR=ON")
+PACKAGECONFIG[minimal] = "-DFLB_MINIMAL=Yes,-DFLB_MINIMAL=No"
+
+PACKAGECONFIG[in-kafka] = "-DFLB_KAFKA=ON -DFLB_IN_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_IN_KAFKA=OFF,librdkafka curl"
+PACKAGECONFIG[out-kafka] = "-DFLB_KAFKA=ON -DFLB_OUT_KAFKA=ON,-DFLB_KAFKA=OFF -DFLB_OUT_KAFKA=OFF,librdkafka curl"
+
+SYSTEMD_SERVICE:${PN} = "fluent-bit.service"
+
+inherit cmake systemd pkgconfig
+
+# disable manipulation of compiler flags and CMAKE_BUILD_TYPE
+# release and coverage are off by default, disable also debug
+EXTRA_OECMAKE += "-DFLB_DEBUG=No"
+
+FULL_OPTIMIZATION:remove = "${@'-O2' if bb.data.inherits_class('clang', d) else ''}"
+TARGET_CC_ARCH += "${SELECTED_OPTIMIZATION}"
+TARGET_CC_ARCH:remove = "-D_FORTIFY_SOURCE=2"
+EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
+
+SECURITY_STRINGFORMAT:remove = "${@bb.utils.contains('PACKAGECONFIG', 'aws-error-reporter', '-Werror=format-security', '', d)}"
+
+# GCC-15 uses C23 std and it does not yet compile with C23
+CFLAGS += "-std=gnu17"
+# 64bit atomics builtins do not exist in compiler on these arches
+LDFLAGS:append:mips = " -latomic"
+LDFLAGS:append:powerpc = " -latomic"
+LDFLAGS:append:riscv32 = " -latomic"
+LDFLAGS:append:riscv64 = " -latomic"
+LDFLAGS:append:x86 = " -latomic"
+
+do_configure:prepend() {
+    sed -i \
+        -e 's#@INIT_MANAGER_IS_SYSTEMD@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'systemd' else 'FALSE'}'#' \
+        -e 's#@INIT_MANAGER_IS_UPSTART@#'${@'TRUE' if d.getVar('INIT_MANAGER') == 'upstart' else 'FALSE'}'#' \
+        ${S}/src/CMakeLists.txt
+}
+
+# flex hardcodes the input file in #line directives leading to TMPDIR contamination of debug sources.
+do_compile:append() {
+    find ${B} -name '*.c' -or -name '*.h' | xargs sed -i -e 's|${TMPDIR}|${TARGET_DBGSRC_DIR}/|g'
+}
+
+# needed for shared-lib package config
+FILES:${PN} += "${libdir}/fluent-bit"
diff --git a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
index fe5e5c067d..679b1a7e98 100644
--- a/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
+++ b/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb
@@ -5,11 +5,10 @@ HOMEPAGE = "http://www.gnuplot.info/"
 SECTION = "console/scientific"
 LICENSE = "gnuplot"
 LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f"
-DEPENDS = "${BPN}-native virtual/libx11 gd readline"
+DEPENDS = "${BPN}-native gd readline"
 
-inherit autotools features_check pkgconfig
+inherit autotools pkgconfig
 # depends on virtual/libx11
-REQUIRED_DISTRO_FEATURES = "x11"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.gz;name=archive \
            http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz;name=qtplot \
@@ -38,10 +37,11 @@ do_install:class-native() {
     rm ${D}${bindir}/*.o
 }
 
-PACKAGECONFIG ??= "cairo"
+PACKAGECONFIG ??= "cairo ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG[cairo] = "--with-cairo,--without-cairo,cairo pango"
 PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua"
 PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},--without-qt,qtbase-native qtbase qtsvg qttools-native"
+PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11"
 
 EXTRA_OECONF = " \
     --with-readline=${STAGING_LIBDIR}/.. \
@@ -50,14 +50,14 @@ EXTRA_OECONF = " \
 "
 
 do_compile:prepend() {
-    install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
+    install -m 0644 ${UNPACKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
 }
 
 do_install:append:class-target() {
     install -d ${D}${datadir}/applications/
-    install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
+    install -m 0644 ${UNPACKDIR}/gnuplot.desktop ${D}${datadir}/applications/
     install -d ${D}${datadir}/pixmaps/
-    install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
+    install -m 0644 ${UNPACKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
 }
 
 PACKAGES =+ "${PN}-x11"
diff --git a/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
index 97c354aba8..69de5628c4 100644
--- a/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb
+++ b/meta-oe/recipes-extended/haveged/haveged_1.9.19.bb
@@ -4,13 +4,11 @@ DESCRIPTION = "The haveged project is an attempt to provide an easy-to-use, unpr
 HOMEPAGE = "https://www.issihosts.com/haveged/index.html"
 
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-# v1.9.17
-SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2"
+SRCREV = "0ef7dd915ee8be4ca2bb10b5cc2bee92b8ede61d"
 SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \
 "
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://github.com/jirka-h/haveged/releases"
 
diff --git a/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb b/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
index d2b23b41b4..2299d55b2b 100644
--- a/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
+++ b/meta-oe/recipes-extended/hexedit/hexedit_1.6.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/pixel/hexedit.git;branch=master;protocol=https \
 
 SRCREV = "eab92dcaa34b66bc5182772afc9fda4ac8a27597"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep update-alternatives
 
diff --git a/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
new file mode 100644
index 0000000000..ecc9c441c5
--- /dev/null
+++ b/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch
@@ -0,0 +1,75 @@
+From b06541a75043c9a8213187fca942a0270783bd0e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 17 Sep 2024 18:22:36 +0000
+Subject: [PATCH] Add cmake check for deducing 32bit or 64bit RISCV
+
+Currently its only compilable for RV64 when RVV is
+enabled, this will extend it to build for RV32 with
+RVV as well
+
+Upstream-Status: Submitted [https://github.com/google/highway/pull/2330]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ CMakeLists.txt | 38 +++++++++++++++++++++++++++++++++++---
+ 1 file changed, 35 insertions(+), 3 deletions(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,6 +59,33 @@ if(CHECK_PIE_SUPPORTED)
+   endif()
+ endif()
+ 
++if (CMAKE_CXX_COMPILER_ARCHITECTURE_ID MATCHES "RISCV32|RISCV64|RISCV128" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv32|riscv64|riscv128")
++  include(CheckCSourceCompiles)
++  check_c_source_compiles("
++  #if __riscv_xlen == 64
++  int main() { return 0; }
++  #else
++  #error Not RISCV-64
++  #endif
++  " IS_RISCV_XLEN_64)
++
++  check_c_source_compiles("
++  #if __riscv_xlen == 32
++  int main() { return 0; }
++  #else
++  #error Not RISCV-32
++  #endif
++  " IS_RISCV_XLEN_32)
++
++  if(IS_RISCV_XLEN_32)
++    set(RISCV_XLEN 32)
++  elseif(IS_RISCV_XLEN_64)
++    set(RISCV_XLEN 64)
++  else()
++    message(WARNING "Unable to determine RISC-V XLEN")
++  endif()
++endif()
++
+ include(GNUInstallDirs)
+ 
+ if (NOT CMAKE_BUILD_TYPE)
+@@ -72,7 +99,7 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set c
+ # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard.
+ set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?")
+ 
+-# Currently this will compile the entire codebase with `-march=rv64gcv1p0`:
++# Currently this will compile the entire codebase with `-march=rv<XLEN>gcv1p0`:
+ set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?")
+ 
+ # Unconditionally adding -Werror risks breaking the build when new warnings
+@@ -378,7 +405,13 @@ else()
+     # we add the gcv compiler flag, which then requires the CPU (now when using
+     # either compiler) to support V.
+     if(HWY_CMAKE_RVV)
+-      list(APPEND HWY_FLAGS -march=rv64gcv1p0)
++      if(RISCV_XLEN EQUAL 64)
++        list(APPEND HWY_FLAGS -march=rv64gcv1p0)
++        add_link_options(-march=rv64gcv1p0)
++      elseif(RISCV_XLEN EQUAL 32)
++        list(APPEND HWY_FLAGS -march=rv32gcv1p0)
++        add_link_options(-march=rv32gcv1p0)
++      endif()
+       if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+         list(APPEND HWY_FLAGS -menable-experimental-extensions)
+       endif()
diff --git a/meta-oe/recipes-extended/highway/highway_1.1.0.bb b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
index 11d9e7cddf..ea38310398 100644
--- a/meta-oe/recipes-extended/highway/highway_1.1.0.bb
+++ b/meta-oe/recipes-extended/highway/highway_1.2.0.bb
@@ -6,12 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9"
 
 inherit cmake
 
-SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master \
+           file://0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch"
 
-SRCREV = "58b52a717469e62b2d9b8eaa2f5dddb44d4a4cbf"
-S = "${WORKDIR}/git"
+SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48"
 
 EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release"
+
 CXXFLAGS:append:arm = " -mfp16-format=ieee"
 # Option not supported with clang and its default format for __fp16 anyway with clang
 CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee"
diff --git a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest
index 59b747dbd8..8b352c3401 100644
--- a/meta-oe/recipes-extended/hiredis/hiredis/run-ptest
+++ b/meta-oe/recipes-extended/hiredis/hiredis/run-ptest
@@ -1,3 +1,18 @@
 #!/bin/sh
 
-TEST_SSL=0 TEST_ASYNC=0 ./test.sh
+TEST_SSL=0 TEST_ASYNC=0 ./test.sh | sed -e 's/PASSED/PASS/g' -e 's/FAILED/FAIL/g' -e 's/SKIPPED/SKIP/g' | awk '
+{
+    gsub(/\x1B\[[0-9;]*m/, "")
+    if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") {
+        printf "%s: %s\n", $NF, $0
+    } else {
+        print
+    }
+}' | awk '{
+    if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") {
+        $NF = ""
+        print $0
+    } else {
+        print
+    }
+}' | awk '{gsub(/:/,"",$NF)}1'
diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
index d081242736..8678447cf5 100644
--- a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
+++ b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb
@@ -10,7 +10,6 @@ SRC_URI = " \
     "
 SRCREV = "60e5075d4ac77424809f855ba3e398df7aacefe8"
 
-S = "${WORKDIR}/git"
 
 inherit cmake ptest
 
@@ -35,5 +34,5 @@ do_install_ptest() {
 
 FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build"
 
-RDEPENDS:${PN} = "redis"
+RDEPENDS:${PN} = "virtual-redis"
 RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}"
diff --git a/meta-oe/recipes-extended/hplip/hplip/0001-Fix-upstream-CFLAGS-override.patch b/meta-oe/recipes-extended/hplip/hplip/0001-Fix-upstream-CFLAGS-override.patch
new file mode 100644
index 0000000000..c8c892c5e1
--- /dev/null
+++ b/meta-oe/recipes-extended/hplip/hplip/0001-Fix-upstream-CFLAGS-override.patch
@@ -0,0 +1,68 @@
+From 297e517d302469fa27dd96c091021b53f9ac2254 Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 26 Apr 2024 14:17:54 -0600
+Subject: [PATCH] Fix upstream CFLAGS override
+
+Upstream check for python clears OS build system CFLAGS
+
+Upstream-Status: Submitted [https://bugs.launchpad.net/hplip/+bug/1879445]
+---
+ configure.in | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index ebea052..80c4618 100644
+--- a/configure.in
++++ b/configure.in
+@@ -628,20 +628,31 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$hpcu
+    fi
+ fi
+ 
+-SAVE_CPPFLAGS="$CPPFLAGS"
+-CFLAGS=`python-config --includes`
+-if [ $? -eq 0 ] 
+-then
+-   echo $FLAGS
+-else
+-CFLAGS=`python3-config --includes`
+-   if [ $? -eq 0 ]
+-   then
+-   echo $FLAGS
+-   fi
++AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)])
++
++PYTHON_INCLUDES=`$python3_config_path --includes`
++if test "X$PYTHON_INCLUDES" == "X" ; then
++  AC_MSG_ERROR([Cannot get Python includes via python3-config], 6)
++fi
++
++PYTHON_LIBS=`$python3_config_path --libs`
++if test "X$PYTHON_LIBS" == "X" ; then
++  AC_MSG_ERROR([Cannot get Python libs via python3-config], 6)
++fi
++
++SAVE_CFLAGS=$CFLAGS
++SAVE_LIBS=$LIBS
++
++CFLAGS="$CFLAGS $PYTHON_INCLUDES"
++LIBS="$LIBS $PYTHON_LIBS"
++
++AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6))
++
++if test "X$python_includes" != "Xok" ; then
++  CFLAGS="$SAVE_CFLAGS"
++  LIBS="$SAVE_LIBS"
+ fi
+ 
+-#CFLAGS=`(python-config --includes)`
+ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite_build" = "no" && test "$hpcups_only_build" = "no"; then
+    AC_ARG_VAR([PYTHON], [Python interpreter/compiler command])
+    AC_CHECK_PROGS(PYTHON,[python python3 python2])
+@@ -664,7 +675,6 @@ if test "$class_driver" = "no" && test "$hpijs_only_build" = "no" && test "$lite
+    AS_IF([test "x$FOUND_HEADER" != "xyes"],
+           [AC_MSG_ERROR([cannot find python-devel support], 6)])
+ fi
+-CFLAGS="$save_CFLAGS"
+ 
+ if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then
+    AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)])
diff --git a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
index be420b4837..ffc18d90c6 100644
--- a/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
+++ b/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb
@@ -1,5 +1,5 @@
 SUMMARY = "HP Linux Imaging and Printing"
-LICENSE="GPL-2.0-only"
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=20f2c819499cc2063e9a7b07b408815c"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
@@ -16,18 +16,16 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0005-hp_ipp.c-Add-printf-format-to-snprintf-calls.patch \
            file://0006-Workaround-patch-for-missing-Python3-transition-of-t.patch \
            file://0001-Fix-installing-ipp-usb-quirk.patch \
-           file://0001-Drop-using-register-storage-classifier.patch"
+           file://0001-Drop-using-register-storage-classifier.patch \
+           file://0001-Fix-upstream-CFLAGS-override.patch"
 SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity"
+
 DEPENDS += "cups python3 libusb1 python3-setuptools-native"
 
 inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd
 
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-CFLAGS += "-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}"
-
 EXTRA_OECONF += "\
         --enable-cups-drv-install \
         --enable-cups-ppd-install \
@@ -74,7 +72,8 @@ RDEPENDS:${PN} += " \
 "
 RDEPENDS:${PN}-filter += "perl ghostscript"
 
-FILES:${PN} += "${datadir}/ipp-usb/quirks/HPLIP.conf"
+FILES:${PN} += "${datadir}/ipp-usb/quirks/HPLIP.conf \
+        ${systemd_system_unitdir}/hplip-printer@.service"
 FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
 FILES:${PN}-ppd = "${datadir}/ppd"
 FILES:${PN}-cups = "${datadir}/cups"
@@ -84,6 +83,4 @@ FILES:${PN}-hal = "${datadir}/hal"
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/*.so"
 
-SYSTEMD_SERVICE:${PN} = "hplip-printer@.service"
-
 CLEANBROKEN = "1"
diff --git a/meta-oe/recipes-extended/hwloc/hwloc_2.9.3.bb b/meta-oe/recipes-extended/hwloc/hwloc_2.12.1.bb
index d72c5f2be5..f56142dffd 100644
--- a/meta-oe/recipes-extended/hwloc/hwloc_2.9.3.bb
+++ b/meta-oe/recipes-extended/hwloc/hwloc_2.12.1.bb
@@ -7,9 +7,9 @@ SECTION = "base"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=79179bb373cd55cbd834463a514fb714"
 
-SRC_URI = "https://www.open-mpi.org/software/${BPN}/v2.9/downloads/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "5c4062ce556f6d3451fc177ffb8673a2120f81df6835dea6a21a90fbdfff0dec"
-UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v2.9/"
+SRC_URI = "https://www.open-mpi.org/software/${BPN}/v2.12/downloads/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "38a90328bb86259f9bb2fe1dc57fd841e111d1e6358012bef23dfd95d21dc66b"
+UPSTREAM_CHECK_URI = "https://www.open-mpi.org/software/hwloc/v2.12/"
 
 inherit autotools bash-completion pkgconfig
 
diff --git a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
index c5e210afcd..994f252a15 100644
--- a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
+++ b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
@@ -1,4 +1,4 @@
-From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001
+From 06207b1340963e77f2e5d08ebf9727180ad86a36 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Fri, 2 Aug 2019 10:41:26 +0800
 Subject: [PATCH] configure.ac: skip running test program when cross-compiling
@@ -7,12 +7,14 @@ Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
 
+diff --git a/configure.ac b/configure.ac
+index c4a9b02..3f5a792 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd mem
+@@ -151,7 +151,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname])
  AC_FUNC_SELECT_ARGTYPES
  
  AC_MSG_CHECKING([for strlcpy])
@@ -21,7 +23,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
                 char a[2];
                 if (strlcpy(a, "yes", 2) != 3)
                     return 1;]])],
-@@ -176,7 +176,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ
+@@ -167,7 +167,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[
                ])
  
  AC_MSG_CHECKING([for strlcat])
@@ -30,7 +32,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
                 char a[4] = "no";
                 if (strlcat(a, "yes", 4) != 5)
                     return 1;]])],
-@@ -191,21 +191,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ
+@@ -182,21 +182,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[
                             [Define to 1 if you have the strlcat function.])
                ])
  
diff --git a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb b/meta-oe/recipes-extended/icewm/icewm_3.7.5.bb
index 6e50231c83..cb792dad4b 100644
--- a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb
+++ b/meta-oe/recipes-extended/icewm/icewm_3.7.5.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b"
 SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \
            file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \
            "
-SRC_URI[sha256sum] = "8d1afe9a2d5e28e88261b68906337449307e53f06c08218e1a6409083998a5f1"
+SRC_URI[sha256sum] = "7457ec08fa74a101b077f391d60f901a77919dcc83a2940992f1f88cd7ec840a"
 
 UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives
 REQUIRED_DISTRO_FEATURES = "x11"
diff --git a/meta-oe/recipes-extended/indent/indent_2.2.12.bb b/meta-oe/recipes-extended/indent/indent_2.2.12.bb
index 1a7d61abc0..7847b535b3 100644
--- a/meta-oe/recipes-extended/indent/indent_2.2.12.bb
+++ b/meta-oe/recipes-extended/indent/indent_2.2.12.bb
@@ -18,7 +18,6 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-Fix-builds-with-recent-gettext.patch \
            file://0001-Remove-dead-paren_level-code.patch \
            "
-SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14"
 SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b"
 
 inherit autotools gettext texinfo
diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
index 84ed3b052b..af9fbda9b8 100644
--- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
+++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb
@@ -4,9 +4,11 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d
 
 SRC_URI = "file://inputattach.conf"
 
+S = "${UNPACKDIR}"
+
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
 do_install() {
-    install -Dm 0644 ${WORKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf
+    install -Dm 0644 ${UNPACKDIR}/inputattach.conf ${D}${sysconfdir}/inputattach.conf
 }
diff --git a/meta-oe/recipes-extended/iotop/iotop_1.26.bb b/meta-oe/recipes-extended/iotop/iotop_1.30.bb
index 9b36b57cb7..9fe774f9f2 100644
--- a/meta-oe/recipes-extended/iotop/iotop_1.26.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_1.30.bb
@@ -1,13 +1,12 @@
 SUMMARY = "A top utility for I/O"
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=686f457fedcecd9b92d69e625291ffa2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3154adaa1a9ca0d8dcc1944518ece1b9"
 
 DEPENDS = "ncurses"
 
-SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https"
-SRCREV = "b15743b04bb04ff1fc6e197d21ba30365349edcb"
+SRC_URI = "git://github.com/Tomas-M/iotop.git;branch=master;protocol=https;tag=v${PV}"
+SRCREV = "c3366a8a235f9c8ddc4797625f22cfdf12ba2c36"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
index 5f2993dd4f..fc94d2caab 100644
--- a/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb
+++ b/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rhinstaller/isomd5sum.git;branch=master;protocol=htt
            file://0002-fix-parallel-error.patch \
 "
 
-S = "${WORKDIR}/git"
 inherit python3native
 
 EXTRA_OEMAKE += " \
@@ -31,6 +30,6 @@ RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg"
 
 FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so"
 
-SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831"
+SRCREV = "ed1f54de86b5d507c4cfa552923e9ddfddd9b893"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch
deleted file mode 100644
index 5eee6f85aa..0000000000
--- a/meta-oe/recipes-extended/jansson/jansson/0001-Fix-overwriting-linker-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001
-From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com>
-Date: Thu, 28 Apr 2022 17:36:54 +0200
-Subject: [PATCH] Fix overwriting linker flags
-
-Upstream-Status: Backport
-[https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39b9ad365f78..ed33e3c47f70 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS)
-    )
-       list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
-       if (VSCRIPT_WORKS)
--         set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
-+         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym")
-       endif()
-    endif()
- 
--- 
-2.35.1
-
diff --git a/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch b/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
new file mode 100644
index 0000000000..a1c17d1d8e
--- /dev/null
+++ b/meta-oe/recipes-extended/jansson/jansson/0001-Only-export-symbols-starting-with-json_-and-jansson_.patch
@@ -0,0 +1,29 @@
+From e5c38614fb7e0bdbcaec6db6133fa62cfed62818 Mon Sep 17 00:00:00 2001
+From: Jaeyoon Jung <jaeyoon.jung@lge.com>
+Date: Wed, 15 Jan 2025 22:11:54 +0900
+Subject: [PATCH] Only export symbols starting with "json_" and "jansson_" for
+ cmake
+
+It's already done by the commit 7c707a7 and bcb6b6f, but not for cmake.
+This makes symbols in the same visibility as built with libtool.
+
+Upstream-Status: Submitted [https://github.com/akheron/jansson/pull/704]
+Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3394236..52b9934 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -325,6 +325,9 @@ if(JANSSON_BUILD_SHARED_LIBS)
+ # some linkers may only support --version-script
+       file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/jansson.sym" "JANSSON_${JANSSON_SOVERSION} {
+     global:
++          json_*;
++          jansson_*;
++    local:
+           *;
+ };
+ ")
diff --git a/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb
index 833060686a..715b1af5c5 100644
--- a/meta-oe/recipes-extended/jansson/jansson_2.14.bb
+++ b/meta-oe/recipes-extended/jansson/jansson_2.14.1.bb
@@ -2,16 +2,16 @@ SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON d
 HOMEPAGE = "http://www.digip.org/jansson/"
 BUGTRACKER = "https://github.com/akheron/jansson/issues"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d9911525d4128bee234ee2d3ccaa2537"
 
 SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \
-           file://0001-Fix-overwriting-linker-flags.patch \
            file://0001-Honour-multilib-paths.patch \
+           file://0001-Only-export-symbols-starting-with-json_-and-jansson_.patch \
            "
-SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9"
+SRC_URI[sha256sum] = "6bd82d3043dadbcd58daaf903d974891128d22aab7dada5d399cb39094af49ce"
 
 UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases"
-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
index bfa0e79d8f..7129d6ef8c 100644
--- a/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
+++ b/meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb
@@ -7,7 +7,6 @@ PV = "2.3.6+git"
 SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=https;branch=master"
 SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545"
 
-S = "${WORKDIR}/git"
 
 do_compile() {
         oe_runmake
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
index 6b60d89187..f3f70b8da3 100644
--- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/rnovacek/konkretcmpi.git;branch=master;protocol=http
            "
 
 SRCREV = "ad28225e6eceff88417a60c1ba8896c8e40f21a7"
-S = "${WORKDIR}/git"
 
 inherit cmake python3-dir
 
@@ -24,8 +23,6 @@ EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
                  ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
                 "
 
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-
 do_install:append() {
     rm -rf ${D}${datadir}
 }
diff --git a/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch b/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch
deleted file mode 100644
index 71c3de9748..0000000000
--- a/meta-oe/recipes-extended/lastlog2/files/0001-remove-lto-to-fix-link-error-of-clang.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 692523d2f8bf0ce893a781761154db4277f0fceb Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-Date: Wed, 19 Jul 2023 07:11:15 +0000
-Subject: remove lto to fix link error of clang
-
-error message:
-| tests/tst-y2038-64bit-time_t.p/tst-y2038-64bit-time_t.c.o: file not recognized: file format not recognized
-| clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
-
-Upstream-Status: Pending
-
-Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index c521577..13d993b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -26,7 +26,6 @@ add_project_arguments(['-D_GNU_SOURCE=1',
-                        '-DPROJECT_VERSION="@0@"'.format(meson.project_version()) ], language : 'c')
- 
- possible_cc_flags = [
--                  '-flto=auto',
-                   '-ffat-lto-objects',
-                  '-fstack-protector-strong',
-                  '-funwind-tables',
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb b/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb
deleted file mode 100644
index 43deac3839..0000000000
--- a/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Y2038 safe version of lastlog"
-HOMEPAGE = "https://github.com/thkukuk/lastlog2"
-DESCRIPTION = "lastlog reports the last login of a given user or of all users who did ever login on a system."
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=020090a00b69dd2af9ab82eb0003ea2c"
-SECTION = "libs"
-
-SRCREV = "6138dff6f2a5216065fa4833a223b56d98cb62f3"
-
-SRC_URI = "git://github.com/thkukuk/lastlog2.git;branch=main;protocol=https \
-           file://0001-remove-lto-to-fix-link-error-of-clang.patch \
-"
-
-S = "${WORKDIR}/git"
-
-inherit meson pkgconfig systemd features_check
-
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} sqlite3 "
-REQUIRED_DISTRO_FEATURES = "pam"
-
-SYSTEMD_SERVICE:${PN} = "lastlog2-import.service"
-
-EXTRA_OEMESON = " -Dpamlibdir=${libdir}"
-
-do_install:append () {
-      if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then
-          # Fix makefile hardcoded path assumptions for systemd (assumes $prefix)
-          # without usrmerge distro feature enabled
-          install -d `dirname ${D}${systemd_unitdir}`
-          mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}`
-      fi
-}
-
-FILES:${PN} += " ${systemd_system_unitdir} "
-FILES:${PN} += " ${libdir} "
-FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* "
diff --git a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
index d540737bc9..6ca8569bc5 100644
--- a/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
+++ b/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb
@@ -13,7 +13,9 @@ SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=ma
 PV = "1.0+git"
 SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613"
 
-S = "${WORKDIR}/git"
+# The current PV is not a git tag but a README content
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch b/meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch
new file mode 100644
index 0000000000..2575578e77
--- /dev/null
+++ b/meta-oe/recipes-extended/libblockdev/files/CVE-2025-6019.patch
@@ -0,0 +1,31 @@
+From b2e9c16c726f62e500241617f8f3a03aa658fbe3 Mon Sep 17 00:00:00 2001
+From: Thomas Blume <Thomas.Blume@suse.com>
+Date: Fri, 16 May 2025 14:27:10 +0200
+Subject: [PATCH] Don't allow suid and dev set on fs resize
+
+Fixes: CVE-2025-6019
+
+CVE: CVE-2025-6019
+Upstream-Status: Backport [ https://github.com/storaged-project/libblockdev/commit/46b54414f66e965e3c37f8f51e621f96258ae22e ]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ src/plugins/fs/generic.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/fs/generic.c b/src/plugins/fs/generic.c
+index 2b2180aa..60f7d75e 100644
+--- a/src/plugins/fs/generic.c
++++ b/src/plugins/fs/generic.c
+@@ -661,7 +661,7 @@ static gchar* fs_mount (const gchar *device, gchar *fstype, gboolean read_only,
+                              "Failed to create temporary directory for mounting '%s'.", device);
+                 return NULL;
+             }
+-            ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "ro" : NULL, NULL, &l_error);
++            ret = bd_fs_mount (device, mountpoint, fstype, read_only ? "nosuid,nodev,ro" : "nosuid,nodev", NULL, &l_error);
+             if (!ret) {
+                 g_propagate_prefixed_error (error, l_error, "Failed to mount '%s': ", device);
+                 g_rmdir (mountpoint);
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
index 1ad8036d7b..48e6971d1a 100644
--- a/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb
+++ b/meta-oe/recipes-extended/libblockdev/libblockdev_3.2.1.bb
@@ -12,28 +12,30 @@ inherit autotools gobject-introspection pkgconfig lib_package
 
 DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme"
 
-SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \
+SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.2.x-branch;protocol=https \
            file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \
+           file://CVE-2025-6019.patch \
            "
-SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050"
-S = "${WORKDIR}/git"
+SRCREV = "b829b60d9ff049abb190f09a3b9a5fac648cd5a3"
 
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
-PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools"
+PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools smart smartmontools"
 PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3"
-PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2"
-PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2"
+PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools libyaml, lvm2"
+PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools libyaml, lvm2"
 PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2"
 PACKAGECONFIG[parted] = "--with-part, --without-part, parted"
-PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux"
+PACKAGECONFIG[fs] = "--with-fs, --without-fs, e2fsprogs util-linux"
 PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native"
 PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux"
 PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key"
 PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools"
-PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key"
+PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup keyutils nss volume-key"
 PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize"
 PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2"
 PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper"
+PACKAGECONFIG[smart] = "--with-smart,--without-smart,libatasmart"
+PACKAGECONFIG[smartmontools] = "--with-smartmontools,--without-smartmontools,json-glib,smartmontools"
 
-export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs"
+export GIR_EXTRA_LIBS_PATH = "${B}/src/utils/.libs"
diff --git a/meta-oe/recipes-extended/libcbor/libcbor_0.11.0.bb b/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
index 0e15393dd5..60c3c6fadd 100755
--- a/meta-oe/recipes-extended/libcbor/libcbor_0.11.0.bb
+++ b/meta-oe/recipes-extended/libcbor/libcbor_0.12.0.bb
@@ -5,9 +5,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f3b3881df62ca763a02d359a6e94071"
 
 SRC_URI = "git://github.com/PJK/libcbor.git;protocol=https;branch=master"
-SRCREV = "170bee2b82cdb7b2ed25af301f62cb6efdd40ec1"
+SRCREV = "ae000f44e8d2a69e1f72a738f7c0b6b4b7cc4fbf"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch b/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
deleted file mode 100644
index 3ecbfce250..0000000000
--- a/meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 18 Dec 2019 23:37:40 -0800
-Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path
-
-Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
-index 2d7102f..55e78f8 100644
---- a/src/libcec/cmake/CheckPlatformSupport.cmake
-+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
-@@ -224,16 +224,16 @@ else()
- 
-       if (${PYTHON_MAJOR_VERSION} EQUAL 2)
-         install(TARGETS     ${SWIG_MODULE_cec_REAL_NAME}
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
-         install(FILES       ${CMAKE_BINARY_DIR}/src/libcec/cec.py
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-+                DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-         install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
-       else()
-         install(TARGETS     ${SWIG_MODULE_cec_REAL_NAME}
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
-         install(FILES       ${CMAKE_BINARY_DIR}/src/libcec/cec.py
--                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-+                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
-       endif()
-     endif()
-   endif()
--- 
-2.24.1
-
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch b/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch
deleted file mode 100644
index 07277f7064..0000000000
--- a/meta-oe/recipes-extended/libcec/libcec/0001-Remove-buggy-test-confusing-host-and-target.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 8ce50bf569ec2d931735180079bbe507730626c8 Mon Sep 17 00:00:00 2001
-From: Yann Dirson <yann@blade-group.com>
-Date: Mon, 7 Sep 2020 18:17:21 +0200
-Subject: [PATCH] Remove buggy test confusing host and target
-
----
-Upstream-Status: Pending
-
- src/libcec/cmake/CheckPlatformSupport.cmake | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
-index 1d99bd8..31dac4f 100644
---- a/src/libcec/cmake/CheckPlatformSupport.cmake
-+++ b/src/libcec/cmake/CheckPlatformSupport.cmake
-@@ -266,14 +266,6 @@ else()
-                 DESTINATION python/cec)
-       endif()
-     else()
--      if(EXISTS "/etc/os-release")
--        file(READ "/etc/os-release" OS_RELEASE)
--        string(REGEX MATCH "ID(_LIKE)?=debian" IS_DEBIAN ${OS_RELEASE})
--        if (IS_DEBIAN)
--          SET(PYTHON_PKG_DIR "dist-packages")
--        endif()
--      endif()
--
-       if (NOT PYTHON_PKG_DIR)
-         SET(PYTHON_PKG_DIR "site-packages")
-       endif()
--- 
-2.28.0
-
diff --git a/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch b/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch
deleted file mode 100644
index ab1ab5b8eb..0000000000
--- a/meta-oe/recipes-extended/libcec/libcec/0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2241edc8b70c2a54d109ac9c0e821889ac138d40 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 27 Jan 2022 22:49:52 -0800
-Subject: [PATCH] cecloader: Match return type of function LibCecBootloader
-
-Fixes
-include/cecloader.h:175:14: error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t'
-      return NULL;
-             ^~~~
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/cecloader.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/cecloader.h b/include/cecloader.h
-index be76468f..550f598e 100644
---- a/include/cecloader.h
-+++ b/include/cecloader.h
-@@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL)
-     if (!g_libCEC)
-     {
-       std::cout << dlerror() << std::endl;
--      return NULL;
-+      return false;
-     }
-   }
- 
-@@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL)
-   if (!LibCecBootloader)
-   {
-     std::cout << "cannot find CECStartBootloader" << std::endl;
--    return NULL;
-+    return false;
-   }
- 
-   bool bReturn = LibCecBootloader();
--- 
-2.35.0
-
diff --git a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
index 599416cb2a..2def38d73f 100644
--- a/meta-oe/recipes-extended/libcec/libcec_6.0.2.bb
+++ b/meta-oe/recipes-extended/libcec/libcec_7.0.0.bb
@@ -2,27 +2,23 @@ SUMMARY = "USB CEC Adaptor communication Library"
 HOMEPAGE = "http://libcec.pulse-eight.com/"
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b3a719e97f49e4841e90573f9b1a98ac"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b3a719e97f49e4841e90573f9b1a98ac"
 
 DEPENDS = "p8platform udev ncurses swig-native python3"
 
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11 libxrandr', '', d)}"
 DEPENDS:append:rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', ' userland', d)}"
 
-SRCREV = "29d82c80bcc62be2878a9ac080de7eb286c4beb9"
+SRCREV = "ceeec8bfd2242792b6de59ce8fb854437208dc11"
 SRC_URI = "git://github.com/Pulse-Eight/libcec.git;branch=release;protocol=https \
-           file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \
            file://0001-Enhance-reproducibility.patch \
-           file://0001-Remove-buggy-test-confusing-host-and-target.patch \
-           file://0001-cecloader-Match-return-type-of-function-LibCecBootlo.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
 # default config is for RaspberryPi API, use the Linux 4.10+ API by default
-PLATFORM_CMAKE_FLAGS ?= "-DHAVE_LINUX_API=1 -DHAVE_RPI_API=0"
+PLATFORM_CMAKE_FLAGS ?= "-DHAVE_LINUX_API=1 -DHAVE_RPI_API=0 -DSKIP_PYTHON_WRAPPER=1"
 EXTRA_OECMAKE += "${PLATFORM_CMAKE_FLAGS}"
 
 # Put client examples into separate packages
diff --git a/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch b/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch
new file mode 100644
index 0000000000..00ceadb10d
--- /dev/null
+++ b/meta-oe/recipes-extended/libconfig/libconfig/0001-Fix-declarations-to-allow-build-with-gcc-15.patch
@@ -0,0 +1,38 @@
+From 0511e285f3c886a388b8e9c6a4829752d60ab44c Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 5 Dec 2024 06:47:40 +0000
+Subject: [PATCH] Fix declarations to allow build with gcc 15
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+
+Upstream-Status: Backport [690342b Fix declarations to allow build with gcc 15]
+---
+ lib/grammar.y | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/grammar.y b/lib/grammar.y
+index 87dac00..0e9d0bb 100644
+--- a/lib/grammar.y
++++ b/lib/grammar.y
+@@ -40,8 +40,7 @@
+ #include "wincompat.h"
+ 
+ /* These declarations are provided to suppress compiler warnings. */
+-extern int libconfig_yylex();
+-extern int libconfig_yyget_lineno();
++extern int libconfig_yyget_lineno(void *);
+ 
+ static const char *err_array_elem_type = "mismatched element type in array";
+ static const char *err_duplicate_setting = "duplicate setting name";
+@@ -80,6 +79,11 @@ void libconfig_yyerror(void *scanner, struct parse_context *ctx,
+   char *sval;
+ }
+ 
++%{
++/* These declarations are provided to suppress compiler warnings. */
++extern int libconfig_yylex(YYSTYPE *, void *);
++%}
++
+ %token <ival> TOK_BOOLEAN TOK_INTEGER TOK_HEX
+ %token <llval> TOK_INTEGER64 TOK_HEX64
+ %token <fval> TOK_FLOAT
diff --git a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb
index 6382569923..a4df707dd7 100644
--- a/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb
+++ b/meta-oe/recipes-extended/libconfig/libconfig_1.7.3.bb
@@ -7,14 +7,18 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fad9b3332be894bab9bc501572864b29"
 
-SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz"
+SRC_URI = "https://hyperrealm.github.io/libconfig/dist/libconfig-${PV}.tar.gz \
+    file://0001-Fix-declarations-to-allow-build-with-gcc-15.patch \
+"
+
+# needed when we modify grammar.y with above patch
+DEPENDS += "bison-native"
 
 UPSTREAM_CHECK_URI = "https://github.com/hyperrealm/libconfig/releases"
 UPSTREAM_CHECK_REGEX = "Version (?P<pver>\d+(\.\d+)+)"
 
 inherit autotools-brokensep pkgconfig
 
-SRC_URI[md5sum] = "15ec701205f91f21b1187f8b61e0d64f"
 SRC_URI[sha256sum] = "545166d6cac037744381d1e9cc5a5405094e7bfad16a411699bcff40bbb31ee7"
 
 PACKAGE_BEFORE_PN = "${PN}++"
diff --git a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
index e3de8aca62..6683c396e2 100644
--- a/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
+++ b/meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master
     file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \
 "
 
-S = "${WORKDIR}/git"
 SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d"
 
 inherit cmake pkgconfig
diff --git a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
index 87778c6314..9f4b2a19d0 100644
--- a/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
+++ b/meta-oe/recipes-extended/libdivecomputer/libdivecomputer_git.bb
@@ -14,6 +14,5 @@ SRCREV = "db9371cf9f38b5a3b2f6e4fae3f92eb052d2d929"
 SRC_URI = "git://github.com/libdivecomputer/libdivecomputer.git;protocol=https;branch=master \
           "
 
-S = "${WORKDIR}/git"
 
 
diff --git a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
index d4bad38b7a..10e6f34870 100644
--- a/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
+++ b/meta-oe/recipes-extended/libexecinfo/libexecinfo_1.1.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://distcache.freebsd.org/local-distfiles/itetcu/${BP}.tar.bz2 \
            file://0001-makefile-Fix-build-on-linux.patch \
            file://0002-execinfo-Fix-compiler-errors-found-with-newer-gcc-cl.patch \
            "
-SRC_URI[md5sum] = "8e9e81c554c1c5d735bc877448e92b91"
 SRC_URI[sha256sum] = "c9a21913e7fdac8ef6b33250b167aa1fc0a7b8a175145e26913a4c19d8a59b1f"
 
 CFLAGS += "-fno-omit-frame-pointer  -D_GNU_SOURCE"
diff --git a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
index eb85a07e99..125b7e9a8d 100644
--- a/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
+++ b/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "https://bitbucket.org/tagoh/libgxim/downloads/${BPN}-${PV}.tar.bz2 \
            file://0003-Add-format-string-qualifier-to-fix-potential-securit.patch \
            "
 
-SRC_URI[md5sum] = "4bb1fa63d00eb224439d413591c29a6a"
 SRC_URI[sha256sum] = "75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79"
 
 LICENSE = "LGPL-2.0-or-later"
diff --git a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch b/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch
deleted file mode 100644
index 1dbf2955c9..0000000000
--- a/meta-oe/recipes-extended/libidn/libidn/0001-largefile.m4-Sync-with-latest-gnulib.patch
+++ /dev/null
@@ -1,390 +0,0 @@
-From 66c1646a3f12836846a054ebd2c427e30c93d3a5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 2 Apr 2023 10:37:15 -0700
-Subject: [PATCH] largefile.m4: Sync with latest gnulib
-
-This ensures it can work with latest autoconf 2.72 release ( upcoming )
-
-Upstream-Status: Backport [it will be not needed with 1.42 release]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- gl/m4/largefile.m4 | 330 ++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 263 insertions(+), 67 deletions(-)
-
-diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
-index 3e8b5e3..7fb81b8 100644
---- a/gl/m4/largefile.m4
-+++ b/gl/m4/largefile.m4
-@@ -1,7 +1,7 @@
- # Enable large files on systems where this is not the default.
- # Enable support for files on Linux file systems with 64-bit inode numbers.
- 
--# Copyright 1992-1996, 1998-2022 Free Software Foundation, Inc.
-+# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,8 +10,9 @@
- # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this
- # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko
- # and ftello in C++ mode as well.
-+# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038.
- AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
--[
-+ m4_ifndef([AC_SYS_YEAR2038], [[
-   AC_REQUIRE([AC_CANONICAL_HOST])
-   AC_FUNC_FSEEKO
-   case "$host_os" in
-@@ -20,10 +21,10 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
-         [Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2).])
-       ;;
-   esac
--])
-+ ]])
-+)
- 
--# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+
--# with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
-+# Work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
- m4_version_prereq([2.70], [], [
-@@ -43,33 +44,258 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
- ])
- ])# m4_version_prereq 2.70
- 
-+# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier.
-+# This code is taken from Autoconf master.
-+m4_ifndef([AC_SYS_YEAR2038], [
-+
-+# _AC_SYS_YEAR2038_TEST_CODE
-+# --------------------------
-+# C code used to probe for time_t that can represent time points more
-+# than 2**31 - 1 seconds after the epoch.  With the usual Unix epoch,
-+# these correspond to dates after 2038-01-18 22:14:07 +0000 (Gregorian),
-+# hence the name.
-+AC_DEFUN([_AC_SYS_YEAR2038_TEST_CODE],
-+[[
-+  #include <time.h>
-+  /* Check that time_t can represent 2**32 - 1 correctly.  */
-+  #define LARGE_TIME_T \\
-+    ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
-+  int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535
-+                           && LARGE_TIME_T % 65537 == 0)
-+                          ? 1 : -1];
-+]])
-+
-+# _AC_SYS_YEAR2038_OPTIONS
-+# ------------------------
-+# List of known ways to enable support for large time_t.  If you change
-+# this list you probably also need to change the AS_CASE at the end of
-+# _AC_SYS_YEAR2038_PROBE.
-+m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
-+    ["none needed"]                   dnl 64-bit and newer 32-bit Unix
-+    ["-D_TIME_BITS=64"]               dnl glibc 2.34 with some 32-bit ABIs
-+    ["-D__MINGW_USE_VC2005_COMPAT"]   dnl 32-bit MinGW
-+    ["-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"]
-+                                      dnl 32-bit MinGW (misconfiguration)
-+))
-+
-+# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED])
-+# -----------------------------------------
-+# Subroutine of AC_SYS_YEAR2038.  Probe for time_t that can represent
-+# time points more than 2**31 - 1 seconds after the epoch (dates after
-+# 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts
-+# to one of the values in the _AC_SYS_YEAR2038_OPTIONS list, or to
-+# "support not detected" if none of them worked.  Then, set compilation
-+# options and #defines as necessary to enable large time_t support.
-+#
-+# Note that we do not test whether mktime, localtime, etc. handle
-+# large values of time_t correctly, as that would require use of
-+# AC_TRY_RUN.  Note also that some systems only support large time_t
-+# together with large off_t.
-+#
-+# If support is not detected, the behavior depends on which of the
-+# top-level AC_SYS_YEAR2038 macros was used (see below).
-+#
-+# If you change this macro you may also need to change
-+# _AC_SYS_YEAR2038_OPTIONS.
-+AC_DEFUN([_AC_SYS_YEAR2038_PROBE],
-+[AC_CACHE_CHECK([for $CC option to enable timestamps after Jan 2038],
-+  [ac_cv_sys_year2038_opts],
-+  [ac_save_CPPFLAGS="$CPPFLAGS"
-+  ac_opt_found=no
-+  for ac_opt in _AC_SYS_YEAR2038_OPTIONS; do
-+    AS_IF([test x"$ac_opt" != x"none needed"],
-+      [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_YEAR2038_TEST_CODE])],
-+      [ac_cv_sys_year2038_opts="$ac_opt"
-+      ac_opt_found=yes])
-+    test $ac_opt_found = no || break
-+  done
-+  CPPFLAGS="$ac_save_CPPFLAGS"
-+  test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected"])
-+
-+ac_have_year2038=yes
-+AS_CASE([$ac_cv_sys_year2038_opts],
-+  ["none needed"], [],
-+  ["support not detected"],
-+    [ac_have_year2038=no
-+     AS_CASE([$enable_year2038],
-+      [yes],
-+        [# If we're not cross compiling and 'touch' works with a large
-+        # timestamp, then we can presume the system supports wider time_t
-+        # *somehow* and we just weren't able to detect it.  One common
-+        # case that we deliberately *don't* probe for is a system that
-+        # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers
-+        # wide time_t.  (It would be inappropriate for us to override an
-+        # intentional use of -m32.)  Error out, demanding use of
-+        # --disable-year2038 if this is intentional.
-+        AS_IF([test $cross_compiling = no],
-+          [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null],
-+            [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`],
-+              [*'Feb  7  2106'* | *'Feb  7 17:10'*],
-+              [AC_MSG_FAILURE(m4_text_wrap(
-+      [this system appears to support timestamps after January 2038,
-+       but no mechanism for enabling wide 'time_t' was detected.
-+       Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.)
-+       To proceed with 32-bit time_t, configure with '--disable-year2038'.],
-+      [], [], [55]))])])])])],
-+
-+  ["-D_TIME_BITS=64"],
-+    [AC_DEFINE([_TIME_BITS], [64],
-+      [Number of bits in time_t, on hosts where this is settable.])],
-+
-+  ["-D__MINGW_USE_VC2005_COMPAT=1"],
-+    [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1],
-+      [Define to 1 on platforms where this makes time_t a 64-bit type.])],
- 
--# _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
--#                               CACHE-VAR,
--#                               DESCRIPTION,
--#                               PROLOGUE, [FUNCTION-BODY])
--# --------------------------------------------------------
--m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
--[AC_CACHE_CHECK([for $1 value needed for large files], [$3],
--[while :; do
--  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
--    [AC_LANG_PROGRAM([$5], [$6])],
--    [$3=no; break])
--  m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])(
--    [AC_LANG_PROGRAM([#undef $1
--#define $1 $2
--$5], [$6])],
--    [$3=$2; break])
--  $3=unknown
--  break
--done])
--case $$3 in #(
--  no | unknown) ;;
--  *) AC_DEFINE_UNQUOTED([$1], [$$3], [$4]);;
--esac
--rm -rf conftest*[]dnl
--])# _AC_SYS_LARGEFILE_MACRO_VALUE
-+  ["-U_USE_32_BIT_TIME_T"*],
-+    [AC_MSG_FAILURE(m4_text_wrap(
-+      [the 'time_t' type is currently forced to be 32-bit.
-+       It will stop working after January 2038.
-+       Remove _USE_32BIT_TIME_T from the compiler flags.],
-+      [], [], [55]))],
-+
-+  [AC_MSG_ERROR(
-+    [internal error: bad value for \$ac_cv_sys_year2038_opts])])
-+])
-+
-+# _AC_SYS_YEAR2038_ENABLE
-+# -----------------------
-+# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN.
-+# Depending on which of the YEAR2038 macros was used, add either an
-+# --enable-year2038, or a --disable-year2038, or no option at all to
-+# the configure script.  Note that this is expanded very late and
-+# therefore there cannot be any code in the AC_ARG_ENABLE.  The
-+# default value for enable_year2038 is emitted unconditionally
-+# because the generated code always looks at this variable.
-+m4_define([_AC_SYS_YEAR2038_ENABLE],
-+[m4_divert_text([DEFAULTS],
-+  m4_provide_if([AC_SYS_YEAR2038],
-+    [enable_year2038=yes],
-+    [enable_year2038=no]))]dnl
-+[AC_ARG_ENABLE([year2038],
-+  m4_provide_if([AC_SYS_YEAR2038],
-+    [AS_HELP_STRING([--disable-year2038],
-+      [do not support timestamps after 2038])],
-+    [AS_HELP_STRING([--enable-year2038],
-+      [support timestamps after 2038])]))])
-+
-+# _AC_SYS_YEAR2038_OPT_IN
-+# -----------------------
-+# If the --enable-year2038 option is given to configure, attempt to
-+# detect and activate support for large time_t on 32-bit systems.
-+# This macro is automatically invoked by AC_SYS_LARGEFILE when large
-+# *file* support is detected.  It does not AC_REQUIRE AC_SYS_LARGEFILE
-+# to avoid a dependency loop, and is therefore unsafe to expose as a
-+# documented macro.
-+AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN],
-+[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-+  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-+])])
-+
-+# AC_SYS_YEAR2038
-+# ---------------
-+# Attempt to detect and activate support for large time_t.
-+# On systems where time_t is not always 64 bits, this probe can be
-+# skipped by passing the --disable-year2038 option to configure.
-+AC_DEFUN([AC_SYS_YEAR2038],
-+[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl
-+[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-+  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-+])])
-+
-+# _AC_SYS_LARGEFILE_TEST_CODE
-+# ---------------------------
-+# C code used to probe for large file support.
-+m4_define([_AC_SYS_LARGEFILE_TEST_CODE],
-+[@%:@include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-+  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-+                      && LARGE_OFF_T % 2147483647 == 1)
-+                     ? 1 : -1]];[]dnl
-+])
-+
-+# _AC_SYS_LARGEFILE_OPTIONS
-+# -------------------------
-+# List of known ways to enable support for large files.  If you change
-+# this list you probably also need to change the AS_CASE at the end of
-+# _AC_SYS_LARGEFILE_PROBE.
-+m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
-+    ["none needed"]                   dnl Most current systems
-+    ["-D_FILE_OFFSET_BITS=64"]        dnl X/Open LFS spec
-+    ["-D_LARGE_FILES=1"]              dnl AIX (which versions?)
-+    ["-n32"]                          dnl Irix 6.2 w/ SGI compiler
-+))
-+
-+# _AC_SYS_LARGEFILE_PROBE
-+# -----------------------
-+# Subroutine of AC_SYS_LARGEFILE. Probe for large file support and set
-+# the cache variable ac_cv_sys_largefile_opts to one of the values in
-+# the _AC_SYS_LARGEFILE_OPTIONS list, or to "support not detected" if
-+# none of the options in that list worked.  Then, set compilation
-+# options and #defines as necessary to enable large file support.
-+#
-+# If large file support is not detected, the behavior depends on which of
-+# the top-level AC_SYS_LARGEFILE macros was used (see below).
-+#
-+# If you change this macro you may also need to change
-+# _AC_SYS_LARGEFILE_OPTIONS.
-+AC_DEFUN([_AC_SYS_LARGEFILE_PROBE],
-+[AC_CACHE_CHECK([for $CC option to enable large file support],
-+  [ac_cv_sys_largefile_opts],
-+  [ac_save_CC="$CC"
-+  ac_opt_found=no
-+  for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do
-+    AS_IF([test x"$ac_opt" != x"none needed"],
-+      [CC="$ac_save_CC $ac_opt"])
-+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])],
-+      [ac_cv_sys_largefile_opts="$ac_opt"
-+      ac_opt_found=yes])
-+    test $ac_opt_found = no || break
-+  done
-+  CC="$ac_save_CC"
-+  test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"])
-+
-+ac_have_largefile=yes
-+AS_CASE([$ac_cv_sys_largefile_opts],
-+  ["none needed"], [],
-+  ["support not detected"],
-+    [ac_have_largefile=no],
-+
-+  ["-D_FILE_OFFSET_BITS=64"],
-+    [AC_DEFINE([_FILE_OFFSET_BITS], [64],
-+      [Number of bits in a file offset, on hosts where this is settable.])],
-+
-+  ["-D_LARGE_FILES=1"],
-+    [AC_DEFINE([_LARGE_FILES], [1],
-+      [Define to 1 on platforms where this makes off_t a 64-bit type.])],
-+
-+  ["-n32"],
-+    [CC="$CC -n32"],
-+
-+  [AC_MSG_ERROR(
-+    [internal error: bad value for \$ac_cv_sys_largefile_opts])])
-+
-+_AC_SYS_YEAR2038_OPT_IN
-+])
- 
-+# _AC_SYS_LARGEFILE_ENABLE
-+# ------------------------
-+# Subroutine of AC_SYS_LARGEFILE.  Note that this
-+# is expanded very late and therefore there cannot be any code in the
-+# AC_ARG_ENABLE.  The default value for enable_largefile is emitted
-+# unconditionally because the generated shell code always looks at
-+# this variable.
-+m4_define([_AC_SYS_LARGEFILE_ENABLE],
-+[m4_divert_text([DEFAULTS],
-+  enable_largefile=yes)]dnl
-+[AC_ARG_ENABLE([largefile],
-+  [AS_HELP_STRING([--disable-largefile], [omit support for large files])])])
- 
- # AC_SYS_LARGEFILE
- # ----------------
-@@ -80,44 +306,14 @@ rm -rf conftest*[]dnl
- # Additionally, on Linux file systems with 64-bit inodes a file that happens
- # to have a 64-bit inode number cannot be accessed by 32-bit applications on
- # Linux x86/x86_64.  This can occur with file systems such as XFS and NFS.
-+# This macro allows configuration to continue if the system doesn't support
-+# large files.
- AC_DEFUN([AC_SYS_LARGEFILE],
--[AC_ARG_ENABLE(largefile,
--               [  --disable-largefile     omit support for large files])
--AS_IF([test "$enable_largefile" != no],
-- [AC_CACHE_CHECK([for special C compiler options needed for large files],
--    ac_cv_sys_largefile_CC,
--    [ac_cv_sys_largefile_CC=no
--     if test "$GCC" != yes; then
--       ac_save_CC=$CC
--       while :; do
--         # IRIX 6.2 and later do not support large files by default,
--         # so use the C compiler's -n32 option if that helps.
--         AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])])
--         AC_COMPILE_IFELSE([], [break])
--         CC="$CC -n32"
--         AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break])
--         break
--       done
--       CC=$ac_save_CC
--       rm -f conftest.$ac_ext
--    fi])
--  if test "$ac_cv_sys_largefile_CC" != no; then
--    CC=$CC$ac_cv_sys_largefile_CC
--  fi
--
--  _AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
--    ac_cv_sys_file_offset_bits,
--    [Number of bits in a file offset, on hosts where this is settable.],
--    [_AC_SYS_LARGEFILE_TEST_INCLUDES])
--  AS_CASE([$ac_cv_sys_file_offset_bits],
--    [unknown],
--      [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1],
--         [ac_cv_sys_large_files],
--         [Define for large files, on AIX-style hosts.],
--         [_AC_SYS_LARGEFILE_TEST_INCLUDES])],
--    [64],
--      [gl_YEAR2038_BODY([])])])
--])# AC_SYS_LARGEFILE
-+[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl
-+  AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE])
-+  AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE])
-+])])
-+])# m4_ifndef AC_SYS_YEAR2038
- 
- # Enable large files on systems where this is implemented by Gnulib, not by the
- # system headers.
--- 
-2.40.0
-
diff --git a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
index 46938bccf6..a066b100c3 100644
--- a/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
+++ b/meta-oe/recipes-extended/libidn/libidn/dont-depend-on-help2man.patch
@@ -1,9 +1,20 @@
+From 62d8c09422148c56b7b1011a5b3ccd553631e3c5 Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Sun, 29 Sep 2024 18:38:05 +0800
+Subject: [PATCH] dont depend on help2man
+
 Upstream-Status: Inappropriate [disable feature]
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---- libidn-1.41.orig/doc/Makefile.am
-+++ libidn-1.41/doc/Makefile.am
-@@ -73,16 +73,9 @@ BUILT_SOURCES = example.txt example2.txt
+---
+ doc/Makefile.am | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ff62009..dba833f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -87,16 +87,9 @@ BUILT_SOURCES = example.txt example2.txt example3.txt example4.txt example5.txt
  
  # Man pages.
  
@@ -14,10 +25,13 @@ Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 -idn.1: $(top_srcdir)/src/idn.c $(top_srcdir)/src/idn.ggo $(top_srcdir)/.version
 -       $(MAKE) -C ../lib
 -       $(MAKE) -C ../src
--       $(AM_V_GEN)$(HELP2MAN) \
+-       $(AM_V_GEN)env SOURCE_DATE_EPOCH=0 $(HELP2MAN) \
 -               --name="Internationalized Domain Names command line tool" \
 -               --output=$@ $(top_builddir)/src/idn$(EXEEXT)
 -
  # GDOC
  
  gdoc_TEXINFOS =
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/libidn/libidn_1.41.bb b/meta-oe/recipes-extended/libidn/libidn_1.43.bb
index 17ffc6cdc5..7c478a1495 100644
--- a/meta-oe/recipes-extended/libidn/libidn_1.41.bb
+++ b/meta-oe/recipes-extended/libidn/libidn_1.43.bb
@@ -3,27 +3,23 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification
 HOMEPAGE = "http://www.gnu.org/software/libidn/"
 SECTION = "libs"
 LICENSE = "(LGPL-2.1-or-later | LGPL-3.0-only) & GPL-3.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f95a3dc99fecfa9a0c4e726d4b5d822f \
+LIC_FILES_CHKSUM = "file://COPYING;md5=11cc2d3ee574f9d6b7ee797bdce4d423\
                     file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \
                     file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
                     file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \
-                    file://lib/idna.h;endline=21;md5=176de4fe1d98e59d743d3b12a850e4cb \
-                    file://src/idn.c;endline=20;md5=dd17b9093355bf669e2ea108d2defbd0 \
+                    file://lib/idna.h;endline=28;md5=82ce5c462ff87f37c7c0d3a92f8d2f6b \
+                    file://src/idn.c;endline=19;md5=21b4efac8525241da4d38dc1c2e3a461 \
                    "
-                   
+
 DEPENDS = "virtual/libiconv autoconf-archive"
 
 inherit pkgconfig autotools gettext texinfo gtk-doc
 
 SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
            file://dont-depend-on-help2man.patch \
-           file://0001-largefile.m4-Sync-with-latest-gnulib.patch \
            "
 
-#SRC_URI[md5sum] = "813c7b268d1051ca02c3610986126f38"
-#SRC_URI[sha256sum] = "14b67108344d81ba844631640df77c9071d9fb0659b080326ff5424e86b14038"
-SRC_URI[sha256sum] = "884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945"
+SRC_URI[sha256sum] = "bdc662c12d041b2539d0e638f3a6e741130cdb33a644ef3496963a443482d164"
 
 # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3
 # so package command into a separate package
@@ -40,4 +36,3 @@ do_install:append() {
 }
 
 BBCLASSEXTEND = "native nativesdk"
-
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
index 81a3c26e04..7f01962a97 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_2.3.0.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_2.6.0.bb
@@ -8,10 +8,9 @@ DEPENDS = "libxml2 glib-2.0 swig python3"
 
 inherit autotools pkgconfig python3native python3targetconfig
 
-SRCREV = "b8fcc89b74c9128a13b07cc15a0ce25dca0cd97e"
+SRCREV = "2117b8fdb6b4096455bd2041a63e59a028120136"
 SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
 CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
diff --git a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
index bfd4af053c..e29ec88e06 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libplist_git.bb
@@ -13,7 +13,6 @@ PV = "2.3.0+git"
 SRCREV = "2cd858c679d25633077ca78b67182a9b77653816"
 SRC_URI = "git://github.com/libimobiledevice/libplist;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS_GROUPS += "CVE_STATUS_LIBLIST"
 CVE_STATUS_LIBLIST[status] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
index a586f49f96..7869fc1941 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.0.2.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_2.1.1.bb
@@ -2,15 +2,14 @@ DESCRIPTION = "This daemon is in charge of multiplexing connections over USB to
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6ab17b41640564434dda85c06b7124f7"
 
-DEPENDS = "udev libusb1 libplist"
+DEPENDS = "udev libusb1 libplist libimobiledevice-glue"
 
 inherit autotools pkgconfig gitpkgv
 
 PKGV = "${GITPKGVTAG}"
 
-SRCREV = "ce98c346b7c1dc2a21faea4fd3f32c88e27ca2af"
+SRCREV = "adf9c22b9010490e4b55eaeb14731991db1c172c"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${base_libdir}/udev/rules.d/"
diff --git a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
index b9f5c34094..76759fe69d 100644
--- a/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
+++ b/meta-oe/recipes-extended/libimobiledevice/libusbmuxd_git.bb
@@ -12,6 +12,5 @@ PV = "2.0.2+git"
 SRCREV = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a"
 SRC_URI = "git://github.com/libimobiledevice/libusbmuxd;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${base_libdir}/udev/rules.d/"
diff --git a/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
index e3e4c01acb..8021d8cf06 100644
--- a/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
+++ b/meta-oe/recipes-extended/libleak/libleak_0.3.6.bb
@@ -14,7 +14,6 @@ SRC_URI = "gitsm://github.com/WuBingzheng/libleak;protocol=https;branch=master \
            file://0001-respect-environment-variables.patch \
           "
 
-S = "${WORKDIR}/git"
 
 do_configure () {
         :
diff --git a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
index 1d650ac63b..c310e0f527 100644
--- a/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
+++ b/meta-oe/recipes-extended/liblightmodbus/liblightmodbus_2.0.2.bb
@@ -12,4 +12,3 @@ SRC_URI = "git://github.com/Jacajack/liblightmodbus.git;protocol=https;branch=ma
           "
 SRCREV = "59d2b405f95701e5b04326589786dbb43ce49e81"
 
-S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
index b094337e90..99f23fef05 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.17.bb
@@ -17,7 +17,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.17.orig.tar.gz \
 SRC_URI[sha256sum] = "6e937f3650afab4aac198f348b89b1ca42edceb17fb6bb0918f642143ccfd15e"
 SRC_URI[1.17-1.sha256sum] = "e3657c0e3facfeccb58900c0b48d56cd68ad5f9f24d1b4c6eaa69c26490fb673"
 
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 
 inherit autotools-brokensep
 
diff --git a/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb b/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
index 5c1c151591..1b7f95d57f 100644
--- a/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
+++ b/meta-oe/recipes-extended/liblogging/liblogging_1.0.6.bb
@@ -12,7 +12,6 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=63fe03535d83726f5655072502bef1bc"
 SRC_URI = "http://download.rsyslog.com/${BPN}/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "f215c7e7ac6cfd1f5dabdba08c522b29"
 SRC_URI[sha256sum] = "338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93"
 
 inherit autotools pkgconfig
diff --git a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
index 0cc128c8c4..89670d10ca 100644
--- a/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
+++ b/meta-oe/recipes-extended/liblognorm/liblognorm_2.0.6.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/rsyslog/liblognorm;branch=master;protocol=https \
            "
 SRCREV = "46c6ee4c8e5f827893e485a4ef1aff04ea881273"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.10.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
index 9e17f91669..ffbb3a8c8e 100644
--- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.10.bb
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.11.bb
@@ -7,9 +7,8 @@ LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://github.com/stephane/libmodbus;branch=master;protocol=https"
-SRCREV = "2cbafa3113e276c3697d297f68e88d112b53174d"
+SRCREV = "5190e5e141780ae481f24be16d7b39a5f3ad8f8f"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
index f08fea7de3..7ec01ecd3f 100644
--- a/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
+++ b/meta-oe/recipes-extended/libpwquality/libpwquality_1.4.5.bb
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/libpwquality/libpwquality;branch=master;protocol=htt
 "
 SRCREV = "5490e96a3dd6ed7371435ca5b3ccef98bdb48b5a"
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gettext setuptools3-base
 
diff --git a/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb b/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb
index 3db9e2e66f..d270bf2113 100644
--- a/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb
+++ b/meta-oe/recipes-extended/libqb/libqb_2.0.8.bb
@@ -9,18 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=321bf41f280cf805086dd5a720b37785"
 
 inherit autotools pkgconfig
 
-SRCREV = "002171bbcf4bc4728da56c1538afd9e9d814ecaf"
-SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=main;protocol=https \
-          "
-S = "${WORKDIR}/git"
+SRC_URI = "https://github.com/ClusterLabs/${BPN}/releases/download/v${PV}/${BP}.tar.xz"
+SRC_URI[sha256sum] = "b42531fc20b8ac02f4c6d0a4dc49f7c4a1eef09bdb13af5f6927b7fc49522ee6"
 
 DEPENDS += "libxml2"
 
 CFLAGS += "-pthread -D_REENTRANT"
 
-do_configure:prepend() {
-    ( cd ${S}
-    ${S}/autogen.sh )
-}
-
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb b/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
index 28c64a1614..ba10f062ec 100644
--- a/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
+++ b/meta-oe/recipes-extended/libreport/libreport_2.17.15.bb
@@ -21,7 +21,6 @@ SRCREV = "f6bb06a699617d078fcd4f8b71b4d063bf47b52b"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit features_check
 REQUIRED_DISTRO_FEATURES = "systemd"
diff --git a/meta-oe/recipes-extended/libserialport/libserialport_0.1.1.bb b/meta-oe/recipes-extended/libserialport/libserialport_0.1.2.bb
index 4190338c1f..71dc33da90 100644
--- a/meta-oe/recipes-extended/libserialport/libserialport_0.1.1.bb
+++ b/meta-oe/recipes-extended/libserialport/libserialport_0.1.2.bb
@@ -8,5 +8,4 @@ inherit autotools
 
 SRC_URI = "http://sigrok.org/download/source/libserialport/libserialport-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "b93f0325a6157198152b5bd7e8182b51"
-SRC_URI[sha256sum] = "4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d"
+SRC_URI[sha256sum] = "5deb92b5ca72c0347b07b786848350deca2dcfd975ce613b8e0e1d947a4b4ca9"
diff --git a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb
index 7498a57049..85d3853f4c 100644
--- a/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb
+++ b/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb
@@ -14,6 +14,7 @@ SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATG
 SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\_\d+)+)"
 
 # Perl5 is for tests only
 EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts"
diff --git a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
index 6e6c8cc226..d7e88f4fd0 100644
--- a/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
+++ b/meta-oe/recipes-extended/libuio/libuio_0.2.1.bb
@@ -11,7 +11,6 @@ PV .= "+0.2.2+git"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 PACKAGES += "${PN}-tools"
 
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch b/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
deleted file mode 100644
index 21a6f292c8..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf/0001-configure-use-pkg-config-for-freetype.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Wed, 6 Aug 2014 14:53:03 +0200
-Subject: [PATCH] configure: use pkg-config for freetype
-
-Upstream-Status: Pending
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- configure.ac | 37 ++++++++-----------------------------
- 1 file changed, 8 insertions(+), 29 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3cfe974..0055a8c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=DIR     use freetype2 in DIR],[
-        fi
- ])
- 
--if [ test -n "$FREETYPE_DIR" ]; then
--       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, ,[$FREETYPE_DIR/bin:$PATH])
--else
--       AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
--fi
--
--if [ test -n "$FREETYPE_CONFIG" ]; then
--       if [ test -n "$FREETYPE_DIR" ]; then
--               freetype_cflags="`$FREETYPE_CONFIG --cflags` -I$FREETYPE_DIR/include"
--               freetype_libs=`$FREETYPE_CONFIG --libs`
--       else
--               freetype_cflags=`$FREETYPE_CONFIG --cflags`
--               freetype_libs=`$FREETYPE_CONFIG --libs`
--       fi
--else
--       if [ test -n "$FREETYPE_DIR" ]; then
--               freetype_cflags="-I$FREETYPE_DIR/include/freetype2 -I$FREETYPE_DIR/include"
--               freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
--       else
--               freetype_cflags=""
--               freetype_libs="-lfreetype"
--       fi
--fi
--
--CPPFLAGS="$freetype_cflags $CPPFLAGS"
--LDFLAGS="$LDFLAGS $freetype_libs"
-+PKG_CHECK_MODULES(FREETYPE2, freetype2, 
-+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+    LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
-+    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
-+)
- 
- AC_CHECK_LIB(freetype,FT_Init_FreeType,[
--       WMF_FT_LDFLAGS="$freetype_libs"
-+       WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
- ],[    AC_MSG_ERROR([* * * freetype(2) is required * * *])
- ])
- AC_CHECK_HEADER(ft2build.h,[
--       WMF_FT_CFLAGS="$freetype_cflags"
--       WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
-+       WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
-+       WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
- ],[    AC_MSG_ERROR([* * * freetype(2) is required * * *])
- ])
- 
--- 
-1.9.0
-
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
deleted file mode 100644
index 4e7cd8887a..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-intoverflow.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-intoverflow.patch?view=log
-
-CVE-2006-3376 libwmf integer overflow
-
---- libwmf-0.2.8.4.orig/src/player.c    2002-12-10 19:30:26.000000000 +0000
-+++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100
-@@ -42,6 +42,7 @@
- #include "player/defaults.h" /* Provides: default settings               */
- #include "player/record.h"   /* Provides: parameter mechanism            */
- #include "player/meta.h"     /* Provides: record interpreters            */
-+#include <stdint.h>
- 
- /**
-  * @internal
-@@ -132,8 +134,14 @@
-                }
-        }
- 
--/*     P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
-- */    P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
-+       if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
-+       {
-+               API->err = wmf_E_InsMem;
-+               WMF_DEBUG (API,"bailing...");
-+               return (API->err);
-+       }
-+       
-+       P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
- 
-        if (ERR (API))
-        {       WMF_DEBUG (API,"bailing...");
diff --git a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch b/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
deleted file mode 100644
index 9a8cbcb508..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf/libwmf-0.2.8.4-useafterfree.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-
-http://cvs.fedoraproject.org/viewvc/devel/libwmf/libwmf-0.2.8.4-useafterfree.patch?view=log
-Resolves: CVE-2009-1364
-
---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list    2009-04-24 04:06:44.000000000 -0400
-+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c       2009-04-24 04:08:30.000000000 -0400
-@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
-        {       more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
-                if (more == 0) return;
-                im->clip->max += 8;
-+                im->clip->list = more;
-        }
-        im->clip->list[im->clip->count] = (*rect);
-        im->clip->count++;
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
new file mode 100644
index 0000000000..c5411d53a1
--- /dev/null
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.13.bb
@@ -0,0 +1,31 @@
+SUMMARY = "Library for converting WMF files"
+#HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html"
+HOMEPAGE = "https://github.com/caolanm/libwmf"
+SECTION = "libs"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+
+DEPENDS:class-native = "freetype-native libpng-native jpeg-native"
+DEPENDS = "freetype libpng jpeg expat gtk+"
+
+BBCLASSEXTEND = "native"
+
+inherit features_check autotools pkgconfig
+
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = "git://github.com/caolanm/libwmf.git;protocol=https;branch=master"
+SRCREV = "9e4737f2293c0d127bda92e5b01896df10571424"
+
+
+do_install:append() {
+    sed -i -e 's@${RECIPE_SYSROOT}@@g' ${D}${bindir}/libwmf-config ${D}${libdir}/pkgconfig/libwmf.pc
+}
+
+FILES:${PN}-dbg += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/.debug"
+FILES:${PN}-dev += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.la"
+FILES:${PN}-staticdev += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.a"
+FILES:${PN} += "${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.so"
+
diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
deleted file mode 100644
index 93b58057ce..0000000000
--- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Library for converting WMF files"
-HOMEPAGE = "http://wvware.sourceforge.net/libwmf.html"
-SECTION = "libs"
-
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-
-DEPENDS:class-native = "freetype-native libpng-native jpeg-native"
-DEPENDS = "freetype libpng jpeg expat gtk+"
-
-BBCLASSEXTEND = "native"
-
-inherit features_check autotools pkgconfig
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=tarball \
-           file://libwmf-0.2.8.4-intoverflow.patch \
-           file://libwmf-0.2.8.4-useafterfree.patch \
-           file://0001-configure-use-pkg-config-for-freetype.patch \
-          "
-
-SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0"
-SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
-
-FILES:${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug"
-FILES:${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la"
-FILES:${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a"
-FILES:${PN} += "${libdir}/gtk-2.0/2.10.0/loaders/*.so"
-
diff --git a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
index f11c52dd11..817322a484 100644
--- a/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
+++ b/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb
@@ -16,10 +16,14 @@ SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/l
 "
 SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048"
 
+UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/"
+
 BPN = "libx86"
 COMPATIBLE_HOST = '(x86_64|i.86).*-linux'
 
 export LIBDIR = "${libdir}"
 export BACKEND = "x86emu"
 
-inherit autotools-brokensep
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch
index 3c6aee9247..70890e2485 100644
--- a/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch
+++ b/meta-oe/recipes-extended/libyang/libyang/0001-test_context-skip-test-case-test_searchdirs.patch
@@ -1,4 +1,4 @@
-From 5de24e1b39c09adb0c5bf4bb4228bd1bb935542a Mon Sep 17 00:00:00 2001
+From 24ec37bfe5c4c248dda0e80d6e7ab27afca1d60e Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Wed, 22 Mar 2023 16:03:56 +0800
 Subject: [PATCH] test_context: skip test case test_searchdirs
@@ -13,10 +13,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/tests/utests/basic/test_context.c b/tests/utests/basic/test_context.c
-index cfba1d30f..8c3bb7ad6 100644
+index 116b2ce36..4e96f4e96 100644
 --- a/tests/utests/basic/test_context.c
 +++ b/tests/utests/basic/test_context.c
-@@ -1061,7 +1061,6 @@ int
+@@ -1110,7 +1110,6 @@ int
  main(void)
  {
      const struct CMUnitTest tests[] = {
@@ -24,6 +24,3 @@ index cfba1d30f..8c3bb7ad6 100644
          UTEST(test_options),
          UTEST(test_models),
          UTEST(test_imports),
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb b/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
index 0eff3247c6..7fff0b96a1 100644
--- a/meta-oe/recipes-extended/libyang/libyang_2.1.148.bb
+++ b/meta-oe/recipes-extended/libyang/libyang_3.12.2.bb
@@ -4,16 +4,15 @@ HOMEPAGE = "https://github.com/CESNET/libyang"
 SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f3916d7d8d42a6508d0ea418cfff10ad"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9bb3d334294e8719f41c531e28a9a697"
 
-SRCREV = "fc4dbd923e044006c93df020590a1e5a8656c09e"
+SRCREV = "da7272e19d9e27d1bfdd68108fa9dce25fbdf5e8"
 
-SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https;tag=v${PV} \
            file://0001-test_context-skip-test-case-test_searchdirs.patch \
            file://run-ptest \
            "
 
-S = "${WORKDIR}/git"
 
 # Main dependencies
 inherit cmake pkgconfig lib_package ptest multilib_header
@@ -31,7 +30,7 @@ do_compile:prepend () {
 }
 
 do_install:append () {
-        oe_multilib_header  libyang/config.h
+        oe_multilib_header  libyang/ly_config.h
 }
 
 do_install_ptest () {
diff --git a/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb b/meta-oe/recipes-extended/libzip/libzip_1.11.4.bb
index a314efc126..039973fdbf 100644
--- a/meta-oe/recipes-extended/libzip/libzip_1.10.1.bb
+++ b/meta-oe/recipes-extended/libzip/libzip_1.11.4.bb
@@ -21,6 +21,6 @@ inherit cmake
 
 SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "dc3c8d5b4c8bbd09626864f6bcf93de701540f761d76b85d7c7d710f4bd90318"
+SRC_URI[sha256sum] = "8a247f57d1e3e6f6d11413b12a6f28a9d388de110adc0ec608d893180ed7097b"
 
 BBCLASSEXTEND += "native"
diff --git a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
index 5716817e95..4911cebd16 100644
--- a/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
+++ b/meta-oe/recipes-extended/linuxconsole/linuxconsole_1.7.1.bb
@@ -21,7 +21,7 @@ SRC_URI = "\
 
 SRC_URI[sha256sum] = "bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547"
 
-S = "${WORKDIR}/linuxconsoletools-${PV}"
+S = "${UNPACKDIR}/linuxconsoletools-${PV}"
 
 inherit systemd pkgconfig
 
@@ -35,7 +35,7 @@ SYSTEMD_AUTO_ENABLE:inputattach = "enable"
 PROVIDES += "joystick"
 
 PACKAGECONFIG ??= "sdl"
-PACKAGECONFIG[sdl] = ",,libsdl2"
+PACKAGECONFIG[sdl] = ",,virtual/libsdl2"
 
 do_compile() {
     if ! ${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'true', 'false', d)}; then
@@ -50,11 +50,11 @@ do_compile() {
 do_install() {
     oe_runmake install
 
-    install -Dm 0644 ${WORKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules
-    install -Dm 0644 ${WORKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules
+    install -Dm 0644 ${UNPACKDIR}/51-these-are-not-joysticks-rm.rules ${D}${nonarch_base_libdir}/udev/rules.d/51-these-are-not-joysticks-rm.rules
+    install -Dm 0644 ${UNPACKDIR}/60-joystick.rules ${D}${nonarch_base_libdir}/udev/rules.d/60-joystick.rules
 
-    install -Dm 0644 ${WORKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service
-    install -Dm 0755 ${WORKDIR}/inputattachctl ${D}${bindir}/inputattachctl
+    install -Dm 0644 ${UNPACKDIR}/inputattach.service ${D}${systemd_system_unitdir}/inputattach.service
+    install -Dm 0755 ${UNPACKDIR}/inputattachctl ${D}${bindir}/inputattachctl
 }
 
 PACKAGES += "inputattach joystick-jscal joystick"
diff --git a/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb b/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb
index 2efaa2b3c6..89012f8852 100644
--- a/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb
+++ b/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8"
 RDEPENDS:${PN} = "perl"
 
 SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "329df0991b879764ed7e50a869de5b6bfa70d241eb254397a5659d1ff5f2588f"
+SRC_URI[sha256sum] = "5eb42d983a9667003368b572149fce788c0d7e13daaf1f28ad1bf3a140b865cf"
 
 do_install() {
     install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts
diff --git a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
index 73e4eac3dd..fd20860a03 100644
--- a/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
+++ b/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb
@@ -6,12 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6570d8d699af1883db9d0e733ac9bfb"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://0001-checkpc-Do-not-define-Mail_fd-multiple-times.patch \
           "
-SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432"
 SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
+
 inherit autotools gettext
 
-EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost"
+EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \
+                                CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \
+                                OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr"
 FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug"
 
 # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it
diff --git a/meta-oe/recipes-extended/magic-enum/magic-enum/run-ptest b/meta-oe/recipes-extended/magic-enum/magic-enum/run-ptest
new file mode 100644
index 0000000000..865da9f69e
--- /dev/null
+++ b/meta-oe/recipes-extended/magic-enum/magic-enum/run-ptest
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+
+fail_count=0
+all_count=0
+
+for test_suite in tests/test_*
+do
+    if "./$test_suite"
+    then
+        echo "PASS: $test_suite"
+    else
+        echo "FAIL: $test_suite"
+        fail_count=$((fail_count + 1))
+    fi
+    all_count=$((all_count + 1))
+done
+
+if [ $fail_count -eq 0 ]
+then
+    echo "PASS: All $all_count tests passed"
+else
+    echo "FAIL: $fail_count of $all_count tests failed"
+fi
diff --git a/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
new file mode 100644
index 0000000000..6d5399c8d0
--- /dev/null
+++ b/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.7.bb
@@ -0,0 +1,43 @@
+# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH
+#
+# SPDX-License-Identifier: MIT
+
+SUMMARY = "Static reflection for enums"
+DESCRIPTION = "Header-only C++17 library provides static reflection for enums, works \
+with any enum type without any macro or boilerplate code."
+BUGTRACKER = "https://github.com/Neargye/magic_enum/issues"
+HOMEPAGE = "https://github.com/Neargye/magic_enum"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7e7717cf723eb72f57e80fdb651cb318"
+
+SRC_URI = " \
+    git://github.com/Neargye/magic_enum.git;protocol=https;branch=master \
+    file://run-ptest \
+"
+
+SRCREV = "e046b69a3736d314fad813e159b1c192eaef92cd"
+
+inherit cmake ptest
+
+EXTRA_OECMAKE = "\
+    -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF \
+"
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/tests
+    install -m 0755 ${B}/test/test_* ${D}${PTEST_PATH}/tests
+}
+
+# Add catkin and colcon (ROS build system) support
+FILES:${PN}-dev += "\
+    ${datadir}/magic_enum/package.xml \
+"
+
+# Header-only library
+# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
+RDEPENDS:${PN}-dev = ""
+RDEPENDS:${PN}-ptest = ""
+RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/md5deep/md5deep_git.bb b/meta-oe/recipes-extended/md5deep/md5deep_git.bb
index 5351a37db6..4b7192290e 100644
--- a/meta-oe/recipes-extended/md5deep/md5deep_git.bb
+++ b/meta-oe/recipes-extended/md5deep/md5deep_git.bb
@@ -13,6 +13,5 @@ SRC_URI = "git://github.com/jessek/hashdeep.git;branch=master;protocol=https \
            file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
index b997d6ce7d..68fd1ee3e0 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
@@ -1,4 +1,4 @@
-From 65923a872e44cb461ef1a03374057351f0bc5efe Mon Sep 17 00:00:00 2001
+From 4952f03d150770ff06f9a12ff42d8de680407649 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 19:39:04 +0800
 Subject: [PATCH] Do not use bundled packages
@@ -10,60 +10,27 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
 ---
- CMakeLists.txt                       | 23 ++++++-----------------
- extensions/libarchive/CMakeLists.txt |  7 ++-----
- 2 files changed, 8 insertions(+), 22 deletions(-)
+ CMakeLists.txt                       | 3 +--
+ cmake/GetBZip2.cmake                 | 3 +++
+ cmake/GetCatch2.cmake                | 4 ++++
+ cmake/GetCivetWeb.cmake              | 3 +++
+ cmake/GetFmt.cmake                   | 3 +++
+ cmake/GetLibCURL.cmake               | 3 +++
+ cmake/GetLibXml2.cmake               | 3 +++
+ cmake/GetOpenSSL.cmake               | 3 +++
+ cmake/GetRocksDB.cmake               | 4 ++++
+ cmake/GetSpdlog.cmake                | 4 ++++
+ cmake/GetZLIB.cmake                  | 3 +++
+ cmake/GetZstd.cmake                  | 4 ++++
+ extensions/libarchive/CMakeLists.txt | 6 ++----
+ 13 files changed, 40 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13a2b992..8a1dd6d9 100644
+index 50e31d871..fc1718dfd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -222,9 +222,7 @@ else()
- endif()
- 
- if (NOT DISABLE_BZIP2 AND (NOT DISABLE_LIBARCHIVE OR (NOT DISABLE_ROCKSDB AND NOT WIN32)))
--    include(BundledBZip2)
--    use_bundled_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/bzip2/dummy")
-+    find_package(BZip2 REQUIRED)
- endif()
- 
- if(NOT WIN32)
-@@ -247,9 +245,7 @@ endif()
- 
- # OpenSSL
- if (NOT OPENSSL_OFF)
--    include(BundledOpenSSL)
--    use_openssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl")
-+    find_package(OpenSSL REQUIRED)
- 
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_SUPPORT")
-@@ -262,9 +258,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSODIUM_STATIC=1")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSODIUM_STATIC=1")
- 
- # zlib
--include(BundledZLIB)
--use_bundled_zlib(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
--list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/zlib/dummy")
-+find_package(ZLIB REQUIRED)
- 
- # uthash
- add_library(ut INTERFACE)
-@@ -272,9 +266,7 @@ target_include_directories(ut SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/thir
- 
- # cURL
- if(NOT DISABLE_CURL)
--    include(BundledLibcURL)
--    use_bundled_curl(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/curl/dummy")
-+    find_package(CURL REQUIRED)
- else()
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_CURL")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_CURL")
-@@ -285,8 +277,7 @@ include(BundledSpdlog)
- use_bundled_spdlog(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+@@ -265,8 +265,7 @@ include(GetSpdlog)
+ get_spdlog()
  
  # yaml-cpp
 -include(BundledYamlCpp)
@@ -72,27 +39,162 @@ index 13a2b992..8a1dd6d9 100644
  
  # concurrentqueue
  add_library(concurrentqueue INTERFACE)
-@@ -357,9 +348,7 @@ include(Extensions)
- add_subdirectory(libminifi)
- 
- if ((ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL) OR ENABLE_ALL OR ENABLE_AZURE)
--    include(BundledLibXml2)
--    use_bundled_libxml2(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
--    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/libxml2/dummy")
-+    find_package(LibXml2 REQUIRED)
- endif()
- 
- if (ENABLE_ALL OR ENABLE_PROMETHEUS OR NOT DISABLE_CIVET)
+diff --git a/cmake/GetBZip2.cmake b/cmake/GetBZip2.cmake
+index 2a7d47e9e..754122895 100644
+--- a/cmake/GetBZip2.cmake
++++ b/cmake/GetBZip2.cmake
+@@ -23,5 +23,8 @@ function(get_bzip2 SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build bzip2 from source")
+         include(BundledBZip2)
+         use_bundled_bzip2(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_BZIP2_SOURCE STREQUAL "SYSTEM")
++        message("Using bzip2 provided by system")
++        find_package(BZip2 REQUIRED)
+     endif()
+ endfunction(get_bzip2)
+diff --git a/cmake/GetCatch2.cmake b/cmake/GetCatch2.cmake
+index d6c1d6acc..ec11b0a77 100644
+--- a/cmake/GetCatch2.cmake
++++ b/cmake/GetCatch2.cmake
+@@ -23,5 +23,9 @@ function(get_catch2)
+     elseif(MINIFI_CATCH2_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build Catch2 from source")
+         include(Catch2)
++    elseif(MINIFI_CATCH2_SOURCE STREQUAL "SYSTEM")
++        message("Using Catch2 provided by system")
++        find_package(Catch2 REQUIRED)
++        add_library(Catch2WithMain ALIAS Catch2::Catch2WithMain)
+     endif()
+ endfunction(get_catch2)
+diff --git a/cmake/GetCivetWeb.cmake b/cmake/GetCivetWeb.cmake
+index f30d22289..8fc39a0e2 100644
+--- a/cmake/GetCivetWeb.cmake
++++ b/cmake/GetCivetWeb.cmake
+@@ -22,5 +22,8 @@ function(get_civetweb)
+     elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build CivetWeb from source")
+         include(CivetWeb)
++    elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "SYSTEM")
++        message("Using CivetWeb provided by system")
++        find_package(civetweb REQUIRED)
+     endif()
+ endfunction(get_civetweb)
+diff --git a/cmake/GetFmt.cmake b/cmake/GetFmt.cmake
+index f4f28458d..579a63897 100644
+--- a/cmake/GetFmt.cmake
++++ b/cmake/GetFmt.cmake
+@@ -22,5 +22,8 @@ function(get_fmt)
+     elseif(MINIFI_FMT_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build Fmt from source")
+         include(fmt)
++    elseif(MINIFI_FMT_SOURCE STREQUAL "SYSTEM")
++        message("Using Fmt provided by system")
++        find_package(fmt REQUIRED)
+     endif()
+ endfunction(get_fmt)
+diff --git a/cmake/GetLibCURL.cmake b/cmake/GetLibCURL.cmake
+index afd38f3c9..0eac59ec4 100644
+--- a/cmake/GetLibCURL.cmake
++++ b/cmake/GetLibCURL.cmake
+@@ -23,5 +23,8 @@ function(get_curl SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build libcurl from source")
+         include(BundledLibcURL)
+         use_bundled_curl(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_LIBCURL_SOURCE STREQUAL "SYSTEM")
++        message("Using libcurl provided by system")
++        find_package(CURL REQUIRED)
+     endif()
+ endfunction(get_curl SOURCE_DIR BINARY_DIR)
+diff --git a/cmake/GetLibXml2.cmake b/cmake/GetLibXml2.cmake
+index 5915b117d..18048715d 100644
+--- a/cmake/GetLibXml2.cmake
++++ b/cmake/GetLibXml2.cmake
+@@ -23,5 +23,8 @@ function(get_libxml2 SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build libxml2 from source")
+         include(BundledLibXml2)
+         use_bundled_libxml2(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_LIBXML2_SOURCE STREQUAL "SYSTEM")
++        message("Using libxml2 provided by system")
++        find_package(libxml2 REQUIRED)
+     endif()
+ endfunction(get_libxml2)
+diff --git a/cmake/GetOpenSSL.cmake b/cmake/GetOpenSSL.cmake
+index 58132c6bf..2b142f94e 100644
+--- a/cmake/GetOpenSSL.cmake
++++ b/cmake/GetOpenSSL.cmake
+@@ -23,5 +23,8 @@ function(get_openssl SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build OpenSSL from source")
+         include(BundledOpenSSL)
+         use_openssl(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_OPENSSL_SOURCE STREQUAL "SYSTEM")
++        message("Using OpenSSL provided by system")
++        find_package(OpenSSL REQUIRED)
+     endif()
+ endfunction(get_openssl)
+diff --git a/cmake/GetRocksDB.cmake b/cmake/GetRocksDB.cmake
+index 0968afc38..3ca1fe565 100644
+--- a/cmake/GetRocksDB.cmake
++++ b/cmake/GetRocksDB.cmake
+@@ -30,5 +30,9 @@ function(get_rocksdb SOURCE_DIR BINARY_DIR)
+             list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/rocksdb/sys")
+             find_package(RocksDB REQUIRED)
+         endif()
++    elseif(MINIFI_ROCKSDB_SOURCE STREQUAL "SYSTEM")
++        message("Using RocksDB provided by system")
++        list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/rocksdb/sys")
++        find_package(RocksDB REQUIRED)
+     endif()
+ endfunction(get_rocksdb SOURCE_DIR BINARY_DIR)
+diff --git a/cmake/GetSpdlog.cmake b/cmake/GetSpdlog.cmake
+index 747894984..6255e31bf 100644
+--- a/cmake/GetSpdlog.cmake
++++ b/cmake/GetSpdlog.cmake
+@@ -27,5 +27,9 @@ function(get_spdlog)
+     elseif(MINIFI_SPDLOG_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build spdlog from source")
+         include(Spdlog)
++    elseif(MINIFI_SPDLOG_SOURCE STREQUAL "SYSTEM")
++        message("Using spdlog provided by system")
++        find_package(spdlog REQUIRED)
++        add_library(spdlog ALIAS spdlog::spdlog)
+     endif()
+ endfunction(get_spdlog)
+diff --git a/cmake/GetZLIB.cmake b/cmake/GetZLIB.cmake
+index 6e7bea1e3..c15e2246a 100644
+--- a/cmake/GetZLIB.cmake
++++ b/cmake/GetZLIB.cmake
+@@ -23,5 +23,8 @@ function(get_zlib SOURCE_DIR BINARY_DIR)
+         message("Using CMake to build zlib from source")
+         include(BundledZLIB)
+         use_bundled_zlib(${SOURCE_DIR} ${BINARY_DIR})
++    elseif(MINIFI_ZLIB_SOURCE STREQUAL "SYSTEM")
++        message("Using zlib provided by system")
++        find_package(ZLIB REQUIRED)
+     endif()
+ endfunction(get_zlib)
+diff --git a/cmake/GetZstd.cmake b/cmake/GetZstd.cmake
+index a0334b02d..0e7600c22 100644
+--- a/cmake/GetZstd.cmake
++++ b/cmake/GetZstd.cmake
+@@ -23,5 +23,9 @@ function(get_zstd)
+     elseif(MINIFI_ZSTD_SOURCE STREQUAL "BUILD")
+         message("Using CMake to build zstd from source")
+         include(Zstd)
++    elseif(MINIFI_ZSTD_SOURCE STREQUAL "SYSTEM")
++        message("Using zstd provided by system")
++        find_package(zstd REQUIRED)
++        add_library(zstd::zstd ALIAS zstd::libzstd_static)
+     endif()
+ endfunction(get_zstd)
 diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt
-index 2b89d3ea..49e13e21 100644
+index bf7b2a7f5..eb6b71091 100644
 --- a/extensions/libarchive/CMakeLists.txt
 +++ b/extensions/libarchive/CMakeLists.txt
-@@ -22,13 +22,10 @@ if (DISABLE_LIBARCHIVE)
+@@ -22,12 +22,10 @@ if (NOT ENABLE_LIBARCHIVE)
  endif()
  
- if (NOT DISABLE_LZMA)
--    include(BundledLibLZMA)
--    use_bundled_liblzma(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ if (ENABLE_LZMA)
+-    include(LibLZMA)
 -    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy")
 +    find_package(LibLZMA REQUIRED)
  endif()
@@ -104,5 +206,5 @@ index 2b89d3ea..49e13e21 100644
  include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
  
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
index 65c52c6337..537beb85d3 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
@@ -1,4 +1,4 @@
-From 4e8e1943541d3b887ba86dc1b488cbb058c7d1cd Mon Sep 17 00:00:00 2001
+From 429b2b357e5142e2b845da95bdd38e8fc1229831 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 20:48:25 +0800
 Subject: [PATCH] Fix osspuuid build
@@ -16,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  create mode 100644 thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
 
 diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake
-index c4fa1523..1faf2e5c 100644
+index 747e52c27..fb6e2164d 100644
 --- a/cmake/BundledOSSPUUID.cmake
 +++ b/cmake/BundledOSSPUUID.cmake
 @@ -23,10 +23,12 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
@@ -33,16 +33,16 @@ index c4fa1523..1faf2e5c 100644
  
      # Define byproducts
      set(BYPRODUCTS "lib/libuuid.a"
-@@ -39,7 +41,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
-     ENDFOREACH(BYPRODUCT)
- 
-     # Build project
--    set(CONFIGURE_COMMAND ./configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
+@@ -45,7 +47,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
+     if(APPLE)
+         string(APPEND ADDITIONAL_COMPILER_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ")
+     endif()
+-    set(CONFIGURE_COMMAND ./configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
 +    set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure --host=${HOST_SYS} --build=${BUILD_SYS} "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
+ 
      string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type)
-     if(NOT build_type MATCHES debug)
-         list(APPEND CONFIGURE_COMMAND --enable-debug=yes)
-@@ -47,10 +49,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
+     if(build_type MATCHES debug)
+@@ -54,10 +56,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
  
      ExternalProject_Add(
              ossp-uuid-external
@@ -56,7 +56,7 @@ index c4fa1523..1faf2e5c 100644
              UPDATE_COMMAND ""
 diff --git a/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
 new file mode 100644
-index 00000000..b8d7b0bb
+index 000000000..b8d7b0bba
 --- /dev/null
 +++ b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
 @@ -0,0 +1,13 @@
@@ -74,5 +74,5 @@ index 00000000..b8d7b0bb
 +         if [ ".$opt_o" != . ]; then
 +             if [ ".$opt_t" = .yes ]; then
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch
index a08962724e..10d9965ef4 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch
@@ -1,4 +1,4 @@
-From 1c697e4d75f0045d5364d622960ff8047a4ad3ec Mon Sep 17 00:00:00 2001
+From a19e548826e65a95a55ac6b9c12a83d3dcc0010d Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 20:56:05 +0800
 Subject: [PATCH] Fix libsodium build
@@ -14,7 +14,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake
-index 3a3daf41..d851f753 100644
+index 98d05b737..4f0faa879 100644
 --- a/cmake/BundledLibSodium.cmake
 +++ b/cmake/BundledLibSodium.cmake
 @@ -58,14 +58,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
@@ -26,7 +26,7 @@ index 3a3daf41..d851f753 100644
  
          ExternalProject_Add(
                  libsodium-external
--                URL "${LIBSODIUM_OFFICIAL_MIRROR_URL} ${LIBSODIUM_GITHUB_MIRROR_URL} ${LIBSODIUM_GENTOO_MIRROR_URL}"
+-                URL "${LIBSODIUM_OFFICIAL_MIRROR_URL}" "${LIBSODIUM_GITHUB_MIRROR_URL}" "${LIBSODIUM_GENTOO_MIRROR_URL}"
 -                URL_HASH ${LIBSODIUM_URL_HASH}
                  BUILD_IN_SOURCE true
 -                SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"
@@ -35,5 +35,5 @@ index 3a3daf41..d851f753 100644
                  CMAKE_COMMAND ""
                  UPDATE_COMMAND ""
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
deleted file mode 100644
index 177c6adee6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8a5fe73f722718aa5c9a467c28a26913771f7208 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Tue, 19 Mar 2024 20:57:37 +0800
-Subject: [PATCH] Fix spdlog build
-
-* Specify CMAKE_INSTALL_LIBDIR to fix multilib build.
-* Do not download spdlog source during compile.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- cmake/BundledSpdlog.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/BundledSpdlog.cmake b/cmake/BundledSpdlog.cmake
-index 974cbbaa..c0c45688 100644
---- a/cmake/BundledSpdlog.cmake
-+++ b/cmake/BundledSpdlog.cmake
-@@ -35,11 +35,12 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
-     endif()
- 
-     # Set build options
--    set(SPDLOG_SOURCE_DIR "${BINARY_DIR}/thirdparty/spdlog-src")
-+    set(SPDLOG_SOURCE_DIR "${SOURCE_DIR}/thirdparty/spdlog-src")
-     set(SPDLOG_INSTALL_DIR "${BINARY_DIR}/thirdparty/spdlog-install")
-     set(SPDLOG_LIBRARY "${SPDLOG_INSTALL_DIR}/${BYPRODUCT}")
-     set(SPDLOG_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
-             "-DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR}"
-+            "-DCMAKE_INSTALL_LIBDIR=${LIBDIR}"
-             "-DSPDLOG_BUILD_EXAMPLE=OFF"
-             "-DSPDLOG_BUILD_TESTS=OFF"
-             "-DSPDLOG_BUILD_TESTING=OFF"
-@@ -49,7 +50,6 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
-     # Build project
-     ExternalProject_Add(
-             spdlog-external
--            URL "https://github.com/gabime/spdlog/archive/v1.8.0.zip"
-             SOURCE_DIR "${SPDLOG_SOURCE_DIR}"
-             CMAKE_ARGS ${SPDLOG_CMAKE_ARGS}
-             BUILD_BYPRODUCTS "${SPDLOG_LIBRARY}"
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch
index 53939131ff..344e8839e7 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch
@@ -1,4 +1,4 @@
-From 083babbd6c6cc6f31530fbac0227c1d426fb0863 Mon Sep 17 00:00:00 2001
+From 229137659501ae51774dcb3249f94545bdd6e21f Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Tue, 19 Mar 2024 21:00:59 +0800
 Subject: [PATCH] Pass --noline flag to flex
@@ -14,18 +14,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt
-index 775b4116..84edc617 100644
+index c179ab3ef..7f507b03a 100644
 --- a/extensions/expression-language/CMakeLists.txt
 +++ b/extensions/expression-language/CMakeLists.txt
-@@ -77,7 +77,7 @@ flex_target(
+@@ -103,7 +103,7 @@ flex_target(
      el-scanner
      ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll
-     ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.cpp
+     ${CMAKE_BINARY_DIR}/el-generated/Scanner.cpp
 -    COMPILE_FLAGS --c++
 +    COMPILE_FLAGS "--c++ --noline"
  )
  
- add_flex_bison_dependency(el-scanner el-parser)
+ set(EL_GENERATED_INCLUDE_DIR ${CMAKE_BINARY_DIR}/el-generated)
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch b/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch
new file mode 100644
index 0000000000..2e78b1087e
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch
@@ -0,0 +1,32 @@
+From 1861170c6de3dd851324debf3a6eaeff4d8d8bce Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 14 Mar 2025 20:26:38 +0800
+Subject: [PATCH] generateVersion.sh: set correct buildrev
+
+Since this script is run outside the source directory, git log can not
+get the commit id, so buildrev is not set correctly. Fix the issue by
+adding -C option.
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ generateVersion.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generateVersion.sh b/generateVersion.sh
+index ff25afba8..0b50a1693 100755
+--- a/generateVersion.sh
++++ b/generateVersion.sh
+@@ -28,7 +28,7 @@ buildident=$8
+ date=$(date +%s)
+ 
+ if [ -d "${src_dir}"/.git ]; then
+-  buildrev=$(git log -1 --pretty=format:"%H")
++  buildrev=$(git -C "${src_dir}" log -1 --pretty=format:"%H")
+ else
+   buildrev="Unknown"
+ fi
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch b/meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch
index 73a59f2a84..055a3e7b57 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch
@@ -1,4 +1,4 @@
-From 44867a8e4100a7296b98e0e850d950d24b980959 Mon Sep 17 00:00:00 2001
+From bbe5c95ef1755c4804c4561c03cafedeb004cb36 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Thu, 21 Mar 2024 10:18:39 +0800
 Subject: [PATCH] CMakeLists.txt: do not use ccache
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a1dd6d91..8a5314544 100644
+index fc1718dfd..70c94c2ff 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -82,12 +82,12 @@ if (USE_REAL_ODBC_TEST_DRIVER)
+@@ -84,12 +84,12 @@ if (MINIFI_USE_REAL_ODBC_TEST_DRIVER)
  endif()
  
  # Use ccache if present
@@ -31,8 +31,8 @@ index 8a1dd6d91..8a5314544 100644
 +#    message("-- Found ccache: ${CCACHE_FOUND}")
 +#endif(CCACHE_FOUND)
  
- # Use gold linker if instructed
- if (UNIX AND USE_GOLD_LINKER AND NOT APPLE )
+ # Check for exec info before we enable the backtrace features.
+ CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO)
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch b/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch
deleted file mode 100644
index 38893e74ac..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 08d1b4b66fedde97eefb5e3ff6aa98fd02be7c21 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Wed, 20 Mar 2024 10:03:14 +0800
-Subject: [PATCH] OsUtils.h: add missing header <cstdint> for int64_t
-
-Fix build with musl:
-libminifi/include/utils/OsUtils.h:31:1: error: 'int64_t' does not name a type
-   31 | int64_t getCurrentProcessPhysicalMemoryUsage();
-      | ^~~~~~~
-libminifi/include/utils/OsUtils.h:22:1: note: 'int64_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
-   21 | #include <system_error>
-  +++ |+#include <cstdint>
-   22 |
-
-Upstream-Status: Pending
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- libminifi/include/utils/OsUtils.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libminifi/include/utils/OsUtils.h b/libminifi/include/utils/OsUtils.h
-index a7117233..5e623d1a 100644
---- a/libminifi/include/utils/OsUtils.h
-+++ b/libminifi/include/utils/OsUtils.h
-@@ -19,6 +19,7 @@
- #include <string>
- #include <optional>
- #include <system_error>
-+#include <cstdint>
- 
- struct sockaddr;
- 
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch b/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
new file mode 100644
index 0000000000..792a7888e3
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
@@ -0,0 +1,141 @@
+From 3a59f8e5331bb6be5d298bc5c136a79102196c1d Mon Sep 17 00:00:00 2001
+From: Frank Denis <github@pureftpd.org>
+Date: Fri, 20 Oct 2023 13:47:57 +0200
+Subject: [PATCH] aarch64: set compiler attributes *after* including
+ <arm_neon.h>
+
+Fixes #1321
+
+Upstream-Status: Backport
+[https://github.com/jedisct1/libsodium/commit/8f453f41f8834e0fe47610f2a3e03e696ddb3450]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ thirdparty/libsodium-stable/configure.ac             | 11 ++++++-----
+ .../crypto_aead/aegis128l/aegis128l_armcrypto.c      | 12 ++++++------
+ .../crypto_aead/aegis256/aegis256_armcrypto.c        | 12 ++++++------
+ .../aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c   | 12 ++++++------
+ 4 files changed, 24 insertions(+), 23 deletions(-)
+
+diff --git a/thirdparty/libsodium-stable/configure.ac b/thirdparty/libsodium-stable/configure.ac
+index df83ef512..be67d3417 100644
+--- a/thirdparty/libsodium-stable/configure.ac
++++ b/thirdparty/libsodium-stable/configure.ac
+@@ -398,11 +398,6 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
+     have_armcrypto=no
+     AC_MSG_CHECKING(for ARM crypto instructions set)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+-      #ifdef __clang__
+-      #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-      #elif defined(__GNUC__)
+-      #  pragma GCC target("+simd+crypto")
+-      #endif
+       #ifndef __ARM_FEATURE_CRYPTO
+       #  define __ARM_FEATURE_CRYPTO 1
+       #endif
+@@ -411,6 +406,12 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
+       #endif
+ 
+       #include <arm_neon.h>
++
++      #ifdef __clang__
++      #  pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++      #elif defined(__GNUC__)
++      #  pragma GCC target("+simd+crypto")
++      #endif
+     ]], [[
+       vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(0));
+ 
+diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
+index 825de8a1c..a01f60cbe 100644
+--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
++++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
+@@ -17,12 +17,6 @@
+ 
+ #include "aegis128l_armcrypto.h"
+ 
+-#ifdef __clang__
+-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-#elif defined(__GNUC__)
+-#pragma GCC target("+simd+crypto")
+-#endif
+-
+ #ifndef __ARM_FEATURE_CRYPTO
+ #define __ARM_FEATURE_CRYPTO 1
+ #endif
+@@ -32,6 +26,12 @@
+ 
+ #include <arm_neon.h>
+ 
++#ifdef __clang__
++#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++#elif defined(__GNUC__)
++#pragma GCC target("+simd+crypto")
++#endif
++
+ #define AES_BLOCK_LENGTH 16
+ 
+ typedef uint8x16_t aes_block_t;
+diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
+index e1ebd577a..058e2072b 100644
+--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
++++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
+@@ -17,12 +17,6 @@
+ 
+ #include "aegis256_armcrypto.h"
+ 
+-#ifdef __clang__
+-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-#elif defined(__GNUC__)
+-#pragma GCC target("+simd+crypto")
+-#endif
+-
+ #ifndef __ARM_FEATURE_CRYPTO
+ #define __ARM_FEATURE_CRYPTO 1
+ #endif
+@@ -32,6 +26,12 @@
+ 
+ #include <arm_neon.h>
+ 
++#ifdef __clang__
++#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++#elif defined(__GNUC__)
++#pragma GCC target("+simd+crypto")
++#endif
++
+ #define AES_BLOCK_LENGTH 16
+ 
+ typedef uint8x16_t aes_block_t;
+diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
+index 0a5a12811..aa76f5cd1 100644
+--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
++++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
+@@ -19,12 +19,6 @@
+ #define __vectorcall
+ #endif
+ 
+-#ifdef __clang__
+-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
+-#elif defined(__GNUC__)
+-#pragma GCC target("+simd+crypto")
+-#endif
+-
+ #ifndef __ARM_FEATURE_CRYPTO
+ #define __ARM_FEATURE_CRYPTO 1
+ #endif
+@@ -34,6 +28,12 @@
+ 
+ #include <arm_neon.h>
+ 
++#ifdef __clang__
++#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
++#elif defined(__GNUC__)
++#pragma GCC target("+simd+crypto")
++#endif
++
+ #define ABYTES    crypto_aead_aes256gcm_ABYTES
+ #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
+ #define KEYBYTES  crypto_aead_aes256gcm_KEYBYTES
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch b/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch
deleted file mode 100644
index c2c51148f6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Move target #pragma after arm_neon.h include
-
-Fix per android/ndk#1945
-
-If the pragma is done before the header include,
-when using clang compiler attribute may apply to the functions in arm_neon.h
-
-Upstream-Status: Submitted [https://github.com/jedisct1/libsodium/pull/1321]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
-+++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
-@@ -19,12 +19,6 @@
- #define __vectorcall
- #endif
- 
--#ifdef __clang__
--#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
--#elif defined(__GNUC__)
--#pragma GCC target("+simd+crypto")
--#endif
--
- #ifndef __ARM_FEATURE_CRYPTO
- #define __ARM_FEATURE_CRYPTO 1
- #endif
-@@ -34,6 +28,12 @@
- 
- #include <arm_neon.h>
- 
-+#ifdef __clang__
-+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
-+#elif defined(__GNUC__)
-+#pragma GCC target("+simd+crypto")
-+#endif
-+
- #define ABYTES    crypto_aead_aes256gcm_ABYTES
- #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
- #define KEYBYTES  crypto_aead_aes256gcm_KEYBYTES
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
index beb247c254..ab08322805 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.15.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
@@ -5,63 +5,74 @@ management, focusing on the collection of data at the source of its creation."
 HOMEPAGE = "https://nifi.apache.org/minifi/index.html"
 SECTION = "console/network"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c62efdfb90a8aa4cc3bc15f56baa30b7"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4c5fc3bbd872752266d21f5f167ce297"
 
 SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=main \
            git://github.com/martinmoene/expected-lite.git;protocol=https;branch=master;name=expected-lite;destsuffix=${S}/thirdparty/expected-lite-src \
            git://github.com/ericniebler/range-v3.git;protocol=https;branch=master;name=range-v3;destsuffix=${S}/thirdparty/range-v3-src \
            git://github.com/Neargye/magic_enum.git;protocol=https;branch=master;name=magic-enum;destsuffix=${S}/thirdparty/magic-enum-src \
-           git://github.com/jarro2783/cxxopts.git;protocol=https;branch=v2_2;name=cxxopts;destsuffix=${S}/thirdparty/cxxopts-src \
+           git://github.com/p-ranav/argparse.git;protocol=https;branch=master;name=argparse;destsuffix=${S}/thirdparty/argparse-src \
            git://github.com/gsl-lite/gsl-lite.git;protocol=https;branch=master;name=gsl-lite;destsuffix=${S}/thirdparty/gsl-lite-src \
            git://github.com/HowardHinnant/date.git;protocol=https;branch=master;name=date;destsuffix=${S}/thirdparty/date-src \
            git://github.com/chriskohlhoff/asio.git;protocol=https;branch=master;name=asio;destsuffix=${S}/thirdparty/asio-src \
+           git://github.com/fmtlib/fmt.git;protocol=https;branch=master;name=fmt;destsuffix=${S}/thirdparty/fmt-src \
            git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;name=spdlog;destsuffix=${S}/thirdparty/spdlog-src \
-           git://github.com/civetweb/civetweb.git;protocol=https;branch=master;name=civetweb;destsuffix=${S}/thirdparty/civetweb-src \
            ${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=${S}/thirdparty \
            https://download.libsodium.org/libsodium/releases/libsodium-1.0.19.tar.gz;name=libsodium;subdir=${S}/thirdparty \
            file://0001-Do-not-use-bundled-packages.patch \
            file://0002-Fix-osspuuid-build.patch \
            file://0003-Fix-libsodium-build.patch \
-           file://0004-Fix-spdlog-build.patch \
-           file://0005-Pass-noline-flag-to-flex.patch \
-           file://0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch \
-           file://0007-CMakeLists.txt-do-not-use-ccache.patch \
-           file://0008-libsodium-aarch64_crypto.patch \
+           file://0004-Pass-noline-flag-to-flex.patch \
+           file://0005-generateVersion.sh-set-correct-buildrev.patch \
+           file://0006-CMakeLists.txt-do-not-use-ccache.patch \
+           file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \
            file://systemd-volatile.conf \
            file://sysvinit-volatile.conf \
           "
 
-SRCREV = "9b55dc0c0f17a190f3e9ade87070a28faf542c25"
+# minifi-cpp: 0.99.1
+SRCREV = "78d53ed154c71f1fabbaff0366d44ed3b32754e6"
+# expected-lite: 0.6.3
 SRCREV_expected-lite = "c8ffab649ba56e43c731b7017a69ddaebe2e1893"
+# range-v3: 0.12.0
 SRCREV_range-v3 = "a81477931a8aa2ad025c6bda0609f38e09e4d7ec"
-SRCREV_magic-enum = "e1ea11a93d0bdf6aae415124ded6126220fa4f28"
-SRCREV_cxxopts = "302302b30839505703d37fb82f536c53cf9172fa"
+# magic-enum: 0.9.6
+SRCREV_magic-enum = "dd6a39d0ba1852cf06907e0f0573a2a10d23c2ad"
+# argparse: 3.0
+SRCREV_argparse = "af442b4da0cd7a07b56fa709bd16571889dc7fda"
+# gsl-lite: 0.41.0
 SRCREV_gsl-lite = "755ba124b54914e672737acace6a9314f59e8d6f"
-SRCREV_date = "6e921e1b1d21e84a5c82416ba7ecd98e33a436d0"
+# date: 3.0.3
+SRCREV_date = "5bdb7e6f31fac909c090a46dbd9fea27b6e609a4"
+# asio: 1.29.0
 SRCREV_asio = "814f67e730e154547aea3f4d99f709cbdf1ea4a0"
-SRCREV_spdlog = "7c02e204c92545f869e2f04edaab1f19fe8b19fd"
-SRCREV_civetweb = "d7ba35bbb649209c66e582d5a0244ba988a15159"
+# fmt: 11.1.4
+SRCREV_fmt = "123913715afeb8a437e6388b4473fcc4753e1c9a"
+# spdlog: 1.15.1
+SRCREV_spdlog = "f355b3d58f7067eee1706ff3c801c2361011f3d5"
 
-SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_cxxopts_gsl-lite_date_asio_spdlog_civetweb"
+SRCREV_FORMAT .= "_expected-lite_range-v3_magic-enum_argparse_gsl-lite_date_asio_fmt_spdlog"
 
+# ossp-uuid: 1.6.2
 SRC_URI[ossp-uuid.sha256sum] = "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
+# libsodium: 1.0.19
 SRC_URI[libsodium.sha256sum] = "018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig cmake systemd
 
-DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip2 yaml-cpp"
+DEPENDS = "virtual/crypt bison-native flex-native flex openssl curl zlib xz bzip2 yaml-cpp zstd lz4"
 
 OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH"
 
+CXXFLAGS:append:toolchain-clang = " -Wno-error=c++11-narrowing-const-reference"
+LDFLAGS:append:riscv32 = " -latomic"
+
 EXTRA_OECMAKE = " \
                  -DCMAKE_BUILD_TYPE=Release \
                  -DHOST_SYS=${HOST_SYS} -DBUILD_SYS=${BUILD_SYS} \
-                 -DGCC_AR=${STAGING_BINDIR_TOOLCHAIN}/${AR} \
-                 -DGCC_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${RANLIB} \
                  -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \
-                 -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines --file-prefix-map=${S}=${TARGET_DBGSRC_DIR}' \
+                 -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines --file-prefix-map=${S}=${TARGET_DBGSRC_DIR} --file-prefix-map=${B}=${TARGET_DBGSRC_DIR}' \
                  -DENABLE_ENCRYPT_CONFIG=ON \
                  -DENABLE_LUA_SCRIPTING=OFF \
                  -DENABLE_PYTHON_SCRIPTING=OFF \
@@ -70,35 +81,49 @@ EXTRA_OECMAKE = " \
                  -DENABLE_GCP=OFF \
                  -DENABLE_KUBERNETES=OFF \
                  -DENABLE_MQTT=OFF \
+                 -DENABLE_GRAFANA_LOKI=OFF \
+                 -DENABLE_GRPC_FOR_LOKI=OFF \
                  -DENABLE_ELASTICSEARCH=OFF \
                  -DENABLE_SQL=OFF \
                  -DENABLE_PROMETHEUS=OFF \
                  -DENABLE_PROCFS=OFF \
                  -DENABLE_SPLUNK=OFF \
                  -DENABLE_OPC=OFF \
-                 -DENABLE_LIBRDKAFKA=OFF \
-                 -DDISABLE_CURL=OFF \
-                 -DDISABLE_BZIP2=OFF \
-                 -DDISABLE_LZMA=OFF \
-                 -DDISABLE_JEMALLOC=ON \
+                 -DENABLE_KAFKA=OFF \
+                 -DENABLE_BZIP2=ON \
+                 -DENABLE_LZMA=ON \
                  -DSKIP_TESTS=ON \
+                 -DMINIFI_OPENSSL_SOURCE=SYSTEM \
+                 -DMINIFI_LIBCURL_SOURCE=SYSTEM \
+                 -DMINIFI_ZSTD_SOURCE=SYSTEM \
+                 -DMINIFI_BZIP2_SOURCE=SYSTEM \
+                 -DMINIFI_LIBXML2_SOURCE=SYSTEM \
+                 -DMINIFI_CATCH2_SOURCE=SYSTEM \
+                 -DMINIFI_ZLIB_SOURCE=SYSTEM \
+                 -DMINIFI_FMT_SOURCE=BUILD \
+                 -DMINIFI_SPDLOG_SOURCE=BUILD \
                  -DFETCHCONTENT_SOURCE_DIR_GSL-LITE=${S}/thirdparty/gsl-lite-src \
                  -DFETCHCONTENT_SOURCE_DIR_DATE_SRC=${S}/thirdparty/date-src \
                  -DFETCHCONTENT_SOURCE_DIR_EXPECTED-LITE=${S}/thirdparty/expected-lite-src \
                  -DFETCHCONTENT_SOURCE_DIR_RANGE-V3_SRC=${S}/thirdparty/range-v3-src \
                  -DFETCHCONTENT_SOURCE_DIR_MAGIC_ENUM=${S}/thirdparty/magic-enum-src \
                  -DFETCHCONTENT_SOURCE_DIR_ASIO=${S}/thirdparty/asio-src \
-                 -DFETCHCONTENT_SOURCE_DIR_CXXOPTS_SRC=${S}/thirdparty/cxxopts-src \
-                 -DFETCHCONTENT_SOURCE_DIR_CIVETWEB=${S}/thirdparty/civetweb-src \
+                 -DFETCHCONTENT_SOURCE_DIR_ARGPARSE=${S}/thirdparty/argparse-src \
+                 -DFETCHCONTENT_SOURCE_DIR_FMT=${S}/thirdparty/fmt-src \
+                 -DFETCHCONTENT_SOURCE_DIR_SPDLOG=${S}/thirdparty/spdlog-src \
                  ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-DENABLE_SYSTEMD=ON', '-DENABLE_SYSTEMD=OFF', d)} \
                 "
 
-PACKAGECONFIG ??= "civetweb libarchive rocksdb expression-language"
-PACKAGECONFIG[civetweb] = "-DDISABLE_CIVET=OFF,-DDISABLE_CIVET=ON"
-PACKAGECONFIG[openwsman] = "-DENABLE_OPENWSMAN=ON,-DENABLE_OPENWSMAN=OFF,libxml2"
-PACKAGECONFIG[libarchive] = "-DDISABLE_LIBARCHIVE=OFF,-DDISABLE_LIBARCHIVE=ON,libarchive"
-PACKAGECONFIG[rocksdb] = "-DDISABLE_ROCKSDB=OFF -DBUILD_ROCKSDB=OFF,-DDISABLE_ROCKSDB=ON,rocksdb"
-PACKAGECONFIG[expression-language] = "-DDISABLE_EXPRESSION_LANGUAGE=OFF, -DDISABLE_EXPRESSION_LANGUAGE=ON"
+PACKAGECONFIG ??= "libarchive expression-language"
+
+# rocksdb is not compatible with libc-musl:powerpc & armv5
+PACKAGECONFIG:remove:libc-musl:powerpc = "rocksdb"
+PACKAGECONFIG:remove:armv5 = "rocksdb"
+
+PACKAGECONFIG[libarchive] = "-DENABLE_LIBARCHIVE=ON,-DENABLE_LIBARCHIVE=OFF,libarchive"
+PACKAGECONFIG[expression-language] = "-DENABLE_EXPRESSION_LANGUAGE=ON, -DENABLE_EXPRESSION_LANGUAGE=OFF"
+PACKAGECONFIG[civetweb] = "-DENABLE_CIVET=ON -DMINIFI_CIVETWEB_SOURCE=SYSTEM,-DENABLE_CIVET=OFF,civetweb"
+PACKAGECONFIG[rocksdb] = "-DENABLE_ROCKSDB=ON -DBUILD_ROCKSDB=OFF -DMINIFI_ROCKSDB_SOURCE=SYSTEM,-DENABLE_ROCKSDB=OFF,rocksdb"
 
 SYSTEMD_PACKAGES = "minifi-cpp"
 SYSTEMD_SERVICE:${PN} = "minifi.service"
@@ -138,9 +163,9 @@ do_install() {
     install -m 755 ${WORKDIR}/minifi-install/usr/extensions/*.so ${D}${libdir}/minifi-extensions
 
     install -m 755 -d ${D}${libexecdir}/minifi-python
-    for i in examples google h2o; do
-        cp -rf ${WORKDIR}/minifi-install/usr/minifi-python/${i} ${D}${libexecdir}/minifi-python
-    done
+    install -m 755 -d ${D}${libexecdir}/minifi-python-examples
+    cp -rf ${WORKDIR}/minifi-install/usr/minifi-python/* ${D}${libexecdir}/minifi-python/
+    cp -rf ${WORKDIR}/minifi-install/usr/minifi-python-examples/* ${D}${libexecdir}/minifi-python-examples/
 
     sed -i "s|MINIFI_HOME=.*|MINIFI_HOME=${MINIFI_HOME}|g" ${D}${MINIFI_BIN}/minifi.sh
     sed -i "s|bin_dir=.*|bin_dir=${MINIFI_BIN}|g" ${D}${MINIFI_BIN}/minifi.sh
@@ -162,7 +187,7 @@ do_install() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -m 755 -d ${D}${sysconfdir}/tmpfiles.d
-        install -m 644 ${WORKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf
+        install -m 644 ${UNPACKDIR}/systemd-volatile.conf ${D}${sysconfdir}/tmpfiles.d/minifi.conf
         sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/tmpfiles.d/minifi.conf
 
         install -m 755 -d ${D}${systemd_system_unitdir}
@@ -174,7 +199,7 @@ do_install() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/default/volatiles
-        install -m 0644 ${WORKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi
+        install -m 0644 ${UNPACKDIR}/sysvinit-volatile.conf ${D}${sysconfdir}/default/volatiles/99_minifi
 
         sed -i "s|@MINIFI_LOG@|${MINIFI_LOG}|g" ${D}${sysconfdir}/default/volatiles/99_minifi
     fi
@@ -194,6 +219,7 @@ FILES:${PN}-dev = ""
 FILES:${PN} += "${libdir}/libcore-minifi.so \
                 ${libdir}/minifi-extensions \
                 ${libexecdir}/minifi-python \
+                ${libexecdir}/minifi-python-examples \
                "
 
 INSANE_SKIP:${PN} += "dev-deps"
diff --git a/meta-oe/recipes-extended/minio/src_uri.inc b/meta-oe/recipes-extended/minio/src_uri.inc
index 5cdc69dfca..964dfab9dc 100644
--- a/meta-oe/recipes-extended/minio/src_uri.inc
+++ b/meta-oe/recipes-extended/minio/src_uri.inc
@@ -1,509 +1,509 @@
 #       github.com/charmbracelet/bubbletea v0.19.3
 # [1] git ls-remote https://github.com/charmbracelet/bubbletea 3dc51789d11229a1fb00f137d02b50b04cac372b 
-SRCREV_bubbletea="3dc51789d11229a1fb00f137d02b50b04cac372b"
+SRCREV_bubbletea = "3dc51789d11229a1fb00f137d02b50b04cac372b"
 SRC_URI += "git://github.com/charmbracelet/bubbletea;name=bubbletea;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/charmbracelet/bubbletea"
 
 #       github.com/cheggaaa/pb v1.0.29
 # [1] git ls-remote https://github.com/cheggaaa/pb e2a33cc368a206516cc95f7bdd9176db0b83f098 
-SRCREV_pb="e2a33cc368a206516cc95f7bdd9176db0b83f098"
+SRCREV_pb = "e2a33cc368a206516cc95f7bdd9176db0b83f098"
 SRC_URI += "git://github.com/cheggaaa/pb;name=pb;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/cheggaaa/pb"
 
 #       github.com/dustin/go-humanize v1.0.0
 # [1] git ls-remote https://github.com/dustin/go-humanize e673fa1ffc91213297a60d18a6f513aa74bced52 
-SRCREV_go-humanize="e673fa1ffc91213297a60d18a6f513aa74bced52"
+SRCREV_go-humanize = "e673fa1ffc91213297a60d18a6f513aa74bced52"
 SRC_URI += "git://github.com/dustin/go-humanize;name=go-humanize;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/dustin/go-humanize"
 
 #       github.com/fatih/color v1.13.0
 # [1] git ls-remote https://github.com/fatih/color a05da93ebe62ca9fc6791d3376ec4dad01196448 
-SRCREV_color="a05da93ebe62ca9fc6791d3376ec4dad01196448"
+SRCREV_color = "a05da93ebe62ca9fc6791d3376ec4dad01196448"
 SRC_URI += "git://github.com/fatih/color;name=color;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/fatih/color"
 
 #       github.com/go-ole/go-ole v1.2.6
 # [1] git ls-remote https://github.com/go-ole/go-ole 8b1f7f90f6b1728609c9694f2cff140d34fd91f8 
-SRCREV_go-ole="8b1f7f90f6b1728609c9694f2cff140d34fd91f8"
+SRCREV_go-ole = "8b1f7f90f6b1728609c9694f2cff140d34fd91f8"
 SRC_URI += "git://github.com/go-ole/go-ole;name=go-ole;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/go-ole/go-ole"
 
 #       github.com/goccy/go-json v0.8.1
 # [1] git ls-remote https://github.com/goccy/go-json de89bd3db67f2219c6183ec6febe2b5f7a6b06fb 
-SRCREV_go-json="de89bd3db67f2219c6183ec6febe2b5f7a6b06fb"
+SRCREV_go-json = "de89bd3db67f2219c6183ec6febe2b5f7a6b06fb"
 SRC_URI += "git://github.com/goccy/go-json;name=go-json;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/goccy/go-json"
 
 #       github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 # [1] git ls-remote https://github.com/google/shlex e7afc7fbc51079733e9468cdfd1efcd7d196cd1d 
-SRCREV_shlex="e7afc7fbc51079733e9468cdfd1efcd7d196cd1d"
+SRCREV_shlex = "e7afc7fbc51079733e9468cdfd1efcd7d196cd1d"
 SRC_URI += "git://github.com/google/shlex;name=shlex;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/shlex"
 
 #       github.com/google/uuid v1.3.0
 # [1] git ls-remote https://github.com/google/uuid 44b5fee7c49cf3bcdf723f106b36d56ef13ccc88 
-SRCREV_uuid="44b5fee7c49cf3bcdf723f106b36d56ef13ccc88"
+SRCREV_uuid = "44b5fee7c49cf3bcdf723f106b36d56ef13ccc88"
 SRC_URI += "git://github.com/google/uuid;name=uuid;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/uuid"
 
 #       github.com/inconshreveable/mousetrap v1.0.0
 # [1] git ls-remote https://github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 
-SRCREV_mousetrap="76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+SRCREV_mousetrap = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
 SRC_URI += "git://github.com/inconshreveable/mousetrap;name=mousetrap;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/inconshreveable/mousetrap"
 
 #       github.com/json-iterator/go v1.1.12
 # [1] git ls-remote https://github.com/json-iterator/go 024077e996b048517130b21ea6bf12aa23055d3d 
-SRCREV_go="024077e996b048517130b21ea6bf12aa23055d3d"
+SRCREV_go = "024077e996b048517130b21ea6bf12aa23055d3d"
 SRC_URI += "git://github.com/json-iterator/go;name=go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/json-iterator/go"
 
 #       github.com/klauspost/compress v1.13.6
 # [1] git ls-remote https://github.com/klauspost/compress 38d4ba985ac157cb858763e016645e14e74c13c4 
-SRCREV_compress="38d4ba985ac157cb858763e016645e14e74c13c4"
+SRCREV_compress = "38d4ba985ac157cb858763e016645e14e74c13c4"
 SRC_URI += "git://github.com/klauspost/compress;name=compress;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/klauspost/compress"
 
 #       github.com/mattn/go-ieproxy v0.0.1
 # [1] git ls-remote https://github.com/mattn/go-ieproxy 439dd0581a2a03b415673a2462ad5c21eaabc588 
-SRCREV_go-ieproxy="439dd0581a2a03b415673a2462ad5c21eaabc588"
+SRCREV_go-ieproxy = "439dd0581a2a03b415673a2462ad5c21eaabc588"
 SRC_URI += "git://github.com/mattn/go-ieproxy;name=go-ieproxy;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-ieproxy"
 
 #       github.com/mattn/go-isatty v0.0.14
 # [1] git ls-remote https://github.com/mattn/go-isatty 504425e14f742f1f517c4586048b49b37f829c8e 
-SRCREV_go-isatty="504425e14f742f1f517c4586048b49b37f829c8e"
+SRCREV_go-isatty = "504425e14f742f1f517c4586048b49b37f829c8e"
 SRC_URI += "git://github.com/mattn/go-isatty;name=go-isatty;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-isatty"
 
 #       github.com/minio/cli v1.22.0
 # [1] git ls-remote https://github.com/minio/cli 735b30120ed7535d13933b0246f8a75cf80b0f74 
-SRCREV_cli="735b30120ed7535d13933b0246f8a75cf80b0f74"
+SRCREV_cli = "735b30120ed7535d13933b0246f8a75cf80b0f74"
 SRC_URI += "git://github.com/minio/cli;name=cli;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/cli"
 
 #       github.com/minio/colorjson v1.0.2
 # [1] git ls-remote https://github.com/minio/colorjson f964b335cdb6cd51dff32a726d3d6ab9e1db0633 
-SRCREV_colorjson="f964b335cdb6cd51dff32a726d3d6ab9e1db0633"
+SRCREV_colorjson = "f964b335cdb6cd51dff32a726d3d6ab9e1db0633"
 SRC_URI += "git://github.com/minio/colorjson;name=colorjson;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/colorjson"
 
 #       github.com/minio/filepath v1.0.0
 # [1] git ls-remote https://github.com/minio/filepath a116cb5d2b6396deea35d06389e3e9809c887fcf 
-SRCREV_filepath="a116cb5d2b6396deea35d06389e3e9809c887fcf"
+SRCREV_filepath = "a116cb5d2b6396deea35d06389e3e9809c887fcf"
 SRC_URI += "git://github.com/minio/filepath;name=filepath;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/filepath"
 
 #       github.com/minio/madmin-go v1.4.3
 # [1] git ls-remote https://github.com/minio/madmin-go 4f71c826739af4ebf73308e7f9a849a781859f78 
-SRCREV_madmin-go="4f71c826739af4ebf73308e7f9a849a781859f78"
+SRCREV_madmin-go = "4f71c826739af4ebf73308e7f9a849a781859f78"
 SRC_URI += "git://github.com/minio/madmin-go;name=madmin-go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/madmin-go"
 
 #       github.com/minio/md5-simd v1.1.2
 # [1] git ls-remote https://github.com/minio/md5-simd 776275e0c9a74ceebbd50fe5c1d61b0c80c608df 
-SRCREV_md5-simd="776275e0c9a74ceebbd50fe5c1d61b0c80c608df"
+SRCREV_md5-simd = "776275e0c9a74ceebbd50fe5c1d61b0c80c608df"
 SRC_URI += "git://github.com/minio/md5-simd;name=md5-simd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/md5-simd"
 
 #       github.com/minio/minio-go/v7 v7.0.30
 # [1] git ls-remote https://github.com/minio/minio-go 81c303325bb4426c89776854b2ea4f7936deb11c 
-SRCREV_v7="81c303325bb4426c89776854b2ea4f7936deb11c"
+SRCREV_v7 = "81c303325bb4426c89776854b2ea4f7936deb11c"
 SRC_URI += "git://github.com/minio/minio-go;name=v7;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/minio-go/v7"
 
 #       github.com/minio/pkg v1.1.22
 # [1] git ls-remote https://github.com/minio/pkg 3b76bdaec27995a31d0b0a7959bbef55bfe0d364 
-SRCREV_pkg="3b76bdaec27995a31d0b0a7959bbef55bfe0d364"
+SRCREV_pkg = "3b76bdaec27995a31d0b0a7959bbef55bfe0d364"
 SRC_URI += "git://github.com/minio/pkg;name=pkg;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/pkg"
 
 #       github.com/minio/selfupdate v0.4.0
 # [1] git ls-remote https://github.com/minio/selfupdate 9e32fb8d38277355add4fa3983edb0b376d12bb5 
-SRCREV_selfupdate="9e32fb8d38277355add4fa3983edb0b376d12bb5"
+SRCREV_selfupdate = "9e32fb8d38277355add4fa3983edb0b376d12bb5"
 SRC_URI += "git://github.com/minio/selfupdate;name=selfupdate;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/selfupdate"
 
 #       github.com/minio/sha256-simd v1.0.0
 # [1] git ls-remote https://github.com/minio/sha256-simd 6a57409d8e0fa3ae883aee331b71aaa40d5a7dd9 
-SRCREV_sha256-simd="6a57409d8e0fa3ae883aee331b71aaa40d5a7dd9"
+SRCREV_sha256-simd = "6a57409d8e0fa3ae883aee331b71aaa40d5a7dd9"
 SRC_URI += "git://github.com/minio/sha256-simd;name=sha256-simd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/minio/sha256-simd"
 
 #       github.com/mitchellh/go-homedir v1.1.0
 # [1] git ls-remote https://github.com/mitchellh/go-homedir af06845cf3004701891bf4fdb884bfe4920b3727 
-SRCREV_go-homedir="af06845cf3004701891bf4fdb884bfe4920b3727"
+SRCREV_go-homedir = "af06845cf3004701891bf4fdb884bfe4920b3727"
 SRC_URI += "git://github.com/mitchellh/go-homedir;name=go-homedir;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mitchellh/go-homedir"
 
 #       github.com/pkg/xattr v0.4.4
 # [1] git ls-remote https://github.com/pkg/xattr 8725d4ccc0fcef59c8d9f0eaf606b3c6f962467a 
-SRCREV_xattr="8725d4ccc0fcef59c8d9f0eaf606b3c6f962467a"
+SRCREV_xattr = "8725d4ccc0fcef59c8d9f0eaf606b3c6f962467a"
 SRC_URI += "git://github.com/pkg/xattr;name=xattr;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/pkg/xattr"
 
 #       github.com/posener/complete v1.2.3
 # [1] git ls-remote https://github.com/posener/complete 05b68ffc813dd10c420993cb1cf927b346c057b8 
-SRCREV_complete="05b68ffc813dd10c420993cb1cf927b346c057b8"
+SRCREV_complete = "05b68ffc813dd10c420993cb1cf927b346c057b8"
 SRC_URI += "git://github.com/posener/complete;name=complete;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/posener/complete"
 
 #       github.com/prometheus/client_golang v1.12.1
 # [1] git ls-remote https://github.com/prometheus/client_golang 2e1c4818ccfdcf953ce399cadad615ff2bed968c 
-SRCREV_client_golang="2e1c4818ccfdcf953ce399cadad615ff2bed968c"
+SRCREV_client_golang = "2e1c4818ccfdcf953ce399cadad615ff2bed968c"
 SRC_URI += "git://github.com/prometheus/client_golang;name=client_golang;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/client_golang"
 
 #       github.com/prometheus/prom2json v1.3.1
 # [1] git ls-remote https://github.com/prometheus/prom2json ac13972e54feb2f8eafc9a613112cb310f5463dc 
-SRCREV_prom2json="ac13972e54feb2f8eafc9a613112cb310f5463dc"
+SRCREV_prom2json = "ac13972e54feb2f8eafc9a613112cb310f5463dc"
 SRC_URI += "git://github.com/prometheus/prom2json;name=prom2json;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/prom2json"
 
 #       github.com/rjeczalik/notify v0.9.2
 # [1] git ls-remote https://github.com/rjeczalik/notify 69d839f37b13a8cb7a78366f7633a4071cb43be7 
-SRCREV_notify="69d839f37b13a8cb7a78366f7633a4071cb43be7"
+SRCREV_notify = "69d839f37b13a8cb7a78366f7633a4071cb43be7"
 SRC_URI += "git://github.com/rjeczalik/notify;name=notify;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rjeczalik/notify"
 
 #       github.com/rs/xid v1.3.0
 # [1] git ls-remote https://github.com/rs/xid efa678f304ab65d6d57eedcb086798381ae22206 
-SRCREV_xid="efa678f304ab65d6d57eedcb086798381ae22206"
+SRCREV_xid = "efa678f304ab65d6d57eedcb086798381ae22206"
 SRC_URI += "git://github.com/rs/xid;name=xid;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rs/xid"
 
 #       github.com/secure-io/sio-go v0.3.1
 # [1] git ls-remote https://github.com/secure-io/sio-go a455d2cd8fcacdfe18557d117db15c0629fb7e2c 
-SRCREV_sio-go="a455d2cd8fcacdfe18557d117db15c0629fb7e2c"
+SRCREV_sio-go = "a455d2cd8fcacdfe18557d117db15c0629fb7e2c"
 SRC_URI += "git://github.com/secure-io/sio-go;name=sio-go;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/secure-io/sio-go"
 
 #       github.com/shirou/gopsutil/v3 v3.21.12
 # [1] git ls-remote https://github.com/shirou/gopsutil 2f8da0a39487ceddf44cebe53a1b563b0b7173cc 
-SRCREV_v3="2f8da0a39487ceddf44cebe53a1b563b0b7173cc"
+SRCREV_v3 = "2f8da0a39487ceddf44cebe53a1b563b0b7173cc"
 SRC_URI += "git://github.com/shirou/gopsutil;name=v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/shirou/gopsutil/v3"
 
 #       github.com/tidwall/gjson v1.12.1
 # [1] git ls-remote https://github.com/tidwall/gjson db0033701cccc8e2e43b77d03e4f509a48b6b2f2 
-SRCREV_gjson="db0033701cccc8e2e43b77d03e4f509a48b6b2f2"
+SRCREV_gjson = "db0033701cccc8e2e43b77d03e4f509a48b6b2f2"
 SRC_URI += "git://github.com/tidwall/gjson;name=gjson;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/gjson"
 
 #       golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
 # [1] git ls-remote https://go.googlesource.com/crypto 793ad666bf5ec61392092b27061be9618e4e219b 
-SRCREV_crypto="793ad666bf5ec61392092b27061be9618e4e219b"
+SRCREV_crypto = "793ad666bf5ec61392092b27061be9618e4e219b"
 SRC_URI += "git://go.googlesource.com/crypto;name=crypto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/crypto"
 
 #       golang.org/x/net v0.0.0-20220225172249-27dd8689420f
 # [1] git ls-remote https://go.googlesource.com/net 27dd8689420fcde088514397d015e4fea5174e0e 
-SRCREV_net="27dd8689420fcde088514397d015e4fea5174e0e"
+SRCREV_net = "27dd8689420fcde088514397d015e4fea5174e0e"
 SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/net"
 
 #       golang.org/x/text v0.3.7
 # [1] git ls-remote https://go.googlesource.com/text 3cd4007149f3f883d229d707172ed356727aae99 
-SRCREV_text="3cd4007149f3f883d229d707172ed356727aae99"
+SRCREV_text = "3cd4007149f3f883d229d707172ed356727aae99"
 SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/text"
 
 #       gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b
 # [1] git ls-remote https://gopkg.in/check.v1 038fdea0a05bc030b0bfda479dc2e08d2220ec74 
-SRCREV_check.v1="038fdea0a05bc030b0bfda479dc2e08d2220ec74"
+SRCREV_check.v1 = "038fdea0a05bc030b0bfda479dc2e08d2220ec74"
 SRC_URI += "git://gopkg.in/check.v1;name=check.v1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/check.v1"
 
 #       gopkg.in/h2non/filetype.v1 v1.0.5
 # [1] git ls-remote https://gopkg.in/h2non/filetype.v1 8f3142c797f0413f00dadaf1bf97dd0b7b1f8d8b 
-SRCREV_filetype.v1="8f3142c797f0413f00dadaf1bf97dd0b7b1f8d8b"
+SRCREV_filetype.v1 = "8f3142c797f0413f00dadaf1bf97dd0b7b1f8d8b"
 SRC_URI += "git://gopkg.in/h2non/filetype.v1;name=filetype.v1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/h2non/filetype.v1"
 
 #       gopkg.in/yaml.v2 v2.4.0
 # [1] git ls-remote https://gopkg.in/yaml.v2 7649d4548cb53a614db133b2a8ac1f31859dda8c 
-SRCREV_yaml.v2="7649d4548cb53a614db133b2a8ac1f31859dda8c"
+SRCREV_yaml.v2 = "7649d4548cb53a614db133b2a8ac1f31859dda8c"
 SRC_URI += "git://gopkg.in/yaml.v2;name=yaml.v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/yaml.v2"
 
 #       github.com/charmbracelet/bubbles v0.10.0
 # [1] git ls-remote https://github.com/charmbracelet/bubbles 7714089ad7c81898564ebeb7b6876b5844e26ccd 
-SRCREV_bubbles="7714089ad7c81898564ebeb7b6876b5844e26ccd"
+SRCREV_bubbles = "7714089ad7c81898564ebeb7b6876b5844e26ccd"
 SRC_URI += "git://github.com/charmbracelet/bubbles;name=bubbles;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/charmbracelet/bubbles"
 
 #       github.com/charmbracelet/lipgloss v0.4.1-0.20220204041308-bf2912e703f6
 # [1] git ls-remote https://github.com/charmbracelet/lipgloss bf2912e703f6ecf88a1b843472afd47ce5002caf 
-SRCREV_lipgloss="bf2912e703f6ecf88a1b843472afd47ce5002caf"
+SRCREV_lipgloss = "bf2912e703f6ecf88a1b843472afd47ce5002caf"
 SRC_URI += "git://github.com/charmbracelet/lipgloss;name=lipgloss;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/charmbracelet/lipgloss"
 
 #       github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1
 # [1] git ls-remote https://github.com/gdamore/tcell f057f0a857a1b3ac3e4fff8c6cfe8126f8387cd1 
-SRCREV_v2="f057f0a857a1b3ac3e4fff8c6cfe8126f8387cd1"
+SRCREV_v2 = "f057f0a857a1b3ac3e4fff8c6cfe8126f8387cd1"
 SRC_URI += "git://github.com/gdamore/tcell;name=v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/gdamore/tcell/v2"
 
 #       github.com/golang-jwt/jwt/v4 v4.4.1
 # [1] git ls-remote https://github.com/golang-jwt/jwt 0972257eba279bb357882afc11db8218644ad565 
-SRCREV_v4="0972257eba279bb357882afc11db8218644ad565"
+SRCREV_v4 = "0972257eba279bb357882afc11db8218644ad565"
 SRC_URI += "git://github.com/golang-jwt/jwt;name=v4;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/golang-jwt/jwt/v4"
 
 #       github.com/navidys/tvxwidgets v0.1.0
 # [1] git ls-remote https://github.com/navidys/tvxwidgets f017cfd5ce6d4bd7fb22529305d7a438c3f1369d 
-SRCREV_tvxwidgets="f017cfd5ce6d4bd7fb22529305d7a438c3f1369d"
+SRCREV_tvxwidgets = "f017cfd5ce6d4bd7fb22529305d7a438c3f1369d"
 SRC_URI += "git://github.com/navidys/tvxwidgets;name=tvxwidgets;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/navidys/tvxwidgets"
 
 #       github.com/olekukonko/tablewriter v0.0.5
 # [1] git ls-remote https://github.com/olekukonko/tablewriter c7d2a8a09b076b70918308a3cd95464b2ae3b5d8 
-SRCREV_tablewriter="c7d2a8a09b076b70918308a3cd95464b2ae3b5d8"
+SRCREV_tablewriter = "c7d2a8a09b076b70918308a3cd95464b2ae3b5d8"
 SRC_URI += "git://github.com/olekukonko/tablewriter;name=tablewriter;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/olekukonko/tablewriter"
 
 #       github.com/prometheus/client_model v0.2.0
 # [1] git ls-remote https://github.com/prometheus/client_model f44e7adcba5ee54c8a94709e6fc300d83245f171 
-SRCREV_client_model="f44e7adcba5ee54c8a94709e6fc300d83245f171"
+SRCREV_client_model = "f44e7adcba5ee54c8a94709e6fc300d83245f171"
 SRC_URI += "git://github.com/prometheus/client_model;name=client_model;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/client_model"
 
 #       github.com/rivo/tview v0.0.0-20211202162923-2a6de950f73b
 # [1] git ls-remote https://github.com/rivo/tview 2a6de950f73bdc70658f7e754d4b5593f15c8408 
-SRCREV_tview="2a6de950f73bdc70658f7e754d4b5593f15c8408"
+SRCREV_tview = "2a6de950f73bdc70658f7e754d4b5593f15c8408"
 SRC_URI += "git://github.com/rivo/tview;name=tview;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rivo/tview"
 
 #       github.com/tinylib/msgp v1.1.6
 # [1] git ls-remote https://github.com/tinylib/msgp 205265da651409c54677b486e350b4d105da6d8b 
-SRCREV_msgp="205265da651409c54677b486e350b4d105da6d8b"
+SRCREV_msgp = "205265da651409c54677b486e350b4d105da6d8b"
 SRC_URI += "git://github.com/tinylib/msgp;name=msgp;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tinylib/msgp"
 
 #       golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 # [1] git ls-remote https://go.googlesource.com/term 03fcf44c2211dcd5eb77510b5f7c1fb02d6ded50 
-SRCREV_term="03fcf44c2211dcd5eb77510b5f7c1fb02d6ded50"
+SRCREV_term = "03fcf44c2211dcd5eb77510b5f7c1fb02d6ded50"
 SRC_URI += "git://go.googlesource.com/term;name=term;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/term"
 
 #       github.com/beorn7/perks v1.0.1
 # [1] git ls-remote https://github.com/beorn7/perks c49ff274687222a7373c4cd83578f1065cf3e143 
-SRCREV_perks="c49ff274687222a7373c4cd83578f1065cf3e143"
+SRCREV_perks = "c49ff274687222a7373c4cd83578f1065cf3e143"
 SRC_URI += "git://github.com/beorn7/perks;name=perks;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/beorn7/perks"
 
 #       github.com/cespare/xxhash/v2 v2.1.2
 # [1] git ls-remote https://github.com/cespare/xxhash 7ae26c41ed6fb1f8a6c21e05eeff4d91b5e401c4 
-SRCREV_v21="7ae26c41ed6fb1f8a6c21e05eeff4d91b5e401c4"
+SRCREV_v21 = "7ae26c41ed6fb1f8a6c21e05eeff4d91b5e401c4"
 SRC_URI += "git://github.com/cespare/xxhash;name=v21;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/cespare/xxhash/v2"
 
 #       github.com/containerd/console v1.0.2
 # [1] git ls-remote https://github.com/containerd/console d5efa7d56fd239f7f3dad2ab6685db09359a3618 
-SRCREV_console="d5efa7d56fd239f7f3dad2ab6685db09359a3618"
+SRCREV_console = "d5efa7d56fd239f7f3dad2ab6685db09359a3618"
 SRC_URI += "git://github.com/containerd/console;name=console;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/containerd/console"
 
 #       github.com/coreos/go-semver v0.3.0
 # [1] git ls-remote https://github.com/coreos/go-semver 6e25b691b0ebe9657dd0ee60d73a9f8716f0c6f5 
-SRCREV_go-semver="6e25b691b0ebe9657dd0ee60d73a9f8716f0c6f5"
+SRCREV_go-semver = "6e25b691b0ebe9657dd0ee60d73a9f8716f0c6f5"
 SRC_URI += "git://github.com/coreos/go-semver;name=go-semver;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/coreos/go-semver"
 
 #       github.com/coreos/go-systemd/v22 v22.3.2
 # [1] git ls-remote https://github.com/coreos/go-systemd 0b40357fd65760243a3eceb80a299772c23c8470 
-SRCREV_v22="0b40357fd65760243a3eceb80a299772c23c8470"
+SRCREV_v22 = "0b40357fd65760243a3eceb80a299772c23c8470"
 SRC_URI += "git://github.com/coreos/go-systemd;name=v22;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/coreos/go-systemd/v22"
 
 #       github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
 # [1] git ls-remote https://github.com/decred/dcrd 75f1b4dac2e43133f3281ac63a9ef9eb699200e5 
-SRCREV_v41="75f1b4dac2e43133f3281ac63a9ef9eb699200e5"
+SRCREV_v41 = "75f1b4dac2e43133f3281ac63a9ef9eb699200e5"
 SRC_URI += "git://github.com/decred/dcrd;name=v41;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/decred/dcrd/dcrec/secp256k1/v4"
 
 #       github.com/fatih/structs v1.1.0
 # [1] git ls-remote https://github.com/fatih/structs 4966fc68f5b7593aafa6cbbba2d65ec6e1416047 
-SRCREV_structs="4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
+SRCREV_structs = "4966fc68f5b7593aafa6cbbba2d65ec6e1416047"
 SRC_URI += "git://github.com/fatih/structs;name=structs;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/fatih/structs"
 
 #       github.com/gdamore/encoding v1.0.0
 # [1] git ls-remote https://github.com/gdamore/encoding 79c592247a6248468805a0e297f43a7cac979903 
-SRCREV_encoding="79c592247a6248468805a0e297f43a7cac979903"
+SRCREV_encoding = "79c592247a6248468805a0e297f43a7cac979903"
 SRC_URI += "git://github.com/gdamore/encoding;name=encoding;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/gdamore/encoding"
 
 #       github.com/gogo/protobuf v1.3.2
 # [1] git ls-remote https://github.com/gogo/protobuf b03c65ea87cdc3521ede29f62fe3ce239267c1bc 
-SRCREV_protobuf="b03c65ea87cdc3521ede29f62fe3ce239267c1bc"
+SRCREV_protobuf = "b03c65ea87cdc3521ede29f62fe3ce239267c1bc"
 SRC_URI += "git://github.com/gogo/protobuf;name=protobuf;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/gogo/protobuf"
 
 #       github.com/golang/protobuf v1.5.2
 # [1] git ls-remote https://github.com/golang/protobuf ae97035608a719c7a1c1c41bed0ae0744bdb0c6f 
-SRCREV_protobuf1="ae97035608a719c7a1c1c41bed0ae0744bdb0c6f"
+SRCREV_protobuf1 = "ae97035608a719c7a1c1c41bed0ae0744bdb0c6f"
 SRC_URI += "git://github.com/golang/protobuf;name=protobuf1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/golang/protobuf"
 
 #       github.com/hashicorp/errwrap v1.1.0
 # [1] git ls-remote https://github.com/hashicorp/errwrap 7b00e5db719c64d14dd0caaacbd13e76254d02c0 
-SRCREV_errwrap="7b00e5db719c64d14dd0caaacbd13e76254d02c0"
+SRCREV_errwrap = "7b00e5db719c64d14dd0caaacbd13e76254d02c0"
 SRC_URI += "git://github.com/hashicorp/errwrap;name=errwrap;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/hashicorp/errwrap"
 
 #       github.com/hashicorp/go-multierror v1.1.1
 # [1] git ls-remote https://github.com/hashicorp/go-multierror 9974e9ec57696378079ecc3accd3d6f29401b3a0 
-SRCREV_go-multierror="9974e9ec57696378079ecc3accd3d6f29401b3a0"
+SRCREV_go-multierror = "9974e9ec57696378079ecc3accd3d6f29401b3a0"
 SRC_URI += "git://github.com/hashicorp/go-multierror;name=go-multierror;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/hashicorp/go-multierror"
 
 #       github.com/klauspost/cpuid/v2 v2.0.9
 # [1] git ls-remote https://github.com/klauspost/cpuid 6903d4066801a7d800d4537ee9eebe81ea97000e 
-SRCREV_v212="6903d4066801a7d800d4537ee9eebe81ea97000e"
+SRCREV_v212 = "6903d4066801a7d800d4537ee9eebe81ea97000e"
 SRC_URI += "git://github.com/klauspost/cpuid;name=v212;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/klauspost/cpuid/v2"
 
 #       github.com/kr/text v0.2.0
 # [1] git ls-remote https://github.com/kr/text 0e5f52c28dd72ab84daeb81b5a51f20fdc35f9c5 
-SRCREV_text1="0e5f52c28dd72ab84daeb81b5a51f20fdc35f9c5"
+SRCREV_text1 = "0e5f52c28dd72ab84daeb81b5a51f20fdc35f9c5"
 SRC_URI += "git://github.com/kr/text;name=text1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/kr/text"
 
 #       github.com/lestrrat-go/backoff/v2 v2.0.8
 # [1] git ls-remote https://github.com/lestrrat-go/backoff c3af762cb9d2bc8339e1d5099a4550366a675f60 
-SRCREV_v2123="c3af762cb9d2bc8339e1d5099a4550366a675f60"
+SRCREV_v2123 = "c3af762cb9d2bc8339e1d5099a4550366a675f60"
 SRC_URI += "git://github.com/lestrrat-go/backoff;name=v2123;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/backoff/v2"
 
 #       github.com/lestrrat-go/blackmagic v1.0.0
 # [1] git ls-remote https://github.com/lestrrat-go/blackmagic 370527f88bbfd5be3192a38af3148dbd64f0976f 
-SRCREV_blackmagic="370527f88bbfd5be3192a38af3148dbd64f0976f"
+SRCREV_blackmagic = "370527f88bbfd5be3192a38af3148dbd64f0976f"
 SRC_URI += "git://github.com/lestrrat-go/blackmagic;name=blackmagic;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/blackmagic"
 
 #       github.com/lestrrat-go/httpcc v1.0.0
 # [1] git ls-remote https://github.com/lestrrat-go/httpcc e7e8fea419e32f7549252ad15ecf17f3a3c1a268 
-SRCREV_httpcc="e7e8fea419e32f7549252ad15ecf17f3a3c1a268"
+SRCREV_httpcc = "e7e8fea419e32f7549252ad15ecf17f3a3c1a268"
 SRC_URI += "git://github.com/lestrrat-go/httpcc;name=httpcc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/httpcc"
 
 #       github.com/lestrrat-go/iter v1.0.1
 # [1] git ls-remote https://github.com/lestrrat-go/iter 628869e97ee3dcc09033086e547a5cab96b0d708 
-SRCREV_iter="628869e97ee3dcc09033086e547a5cab96b0d708"
+SRCREV_iter = "628869e97ee3dcc09033086e547a5cab96b0d708"
 SRC_URI += "git://github.com/lestrrat-go/iter;name=iter;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/iter"
 
 #       github.com/lestrrat-go/jwx v1.2.14
 # [1] git ls-remote https://github.com/lestrrat-go/jwx de7d9bca43812abc4f630320f8632108ccfe34bf 
-SRCREV_jwx="de7d9bca43812abc4f630320f8632108ccfe34bf"
+SRCREV_jwx = "de7d9bca43812abc4f630320f8632108ccfe34bf"
 SRC_URI += "git://github.com/lestrrat-go/jwx;name=jwx;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/jwx"
 
 #       github.com/lestrrat-go/option v1.0.0
 # [1] git ls-remote https://github.com/lestrrat-go/option 7e3467dce320ff45667b138ae503367c92deaa0b 
-SRCREV_option="7e3467dce320ff45667b138ae503367c92deaa0b"
+SRCREV_option = "7e3467dce320ff45667b138ae503367c92deaa0b"
 SRC_URI += "git://github.com/lestrrat-go/option;name=option;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lestrrat-go/option"
 
 #       github.com/lucasb-eyer/go-colorful v1.2.0
 # [1] git ls-remote https://github.com/lucasb-eyer/go-colorful d2b05a0d83cca9d610425691c3253d5f36d0ad06 
-SRCREV_go-colorful="d2b05a0d83cca9d610425691c3253d5f36d0ad06"
+SRCREV_go-colorful = "d2b05a0d83cca9d610425691c3253d5f36d0ad06"
 SRC_URI += "git://github.com/lucasb-eyer/go-colorful;name=go-colorful;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lucasb-eyer/go-colorful"
 
 #       github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0
 # [1] git ls-remote https://github.com/lufia/plan9stats 39d0f177ccd07bdf5eb6f051ab9b09651f05d6f2 
-SRCREV_plan9stats="39d0f177ccd07bdf5eb6f051ab9b09651f05d6f2"
+SRCREV_plan9stats = "39d0f177ccd07bdf5eb6f051ab9b09651f05d6f2"
 SRC_URI += "git://github.com/lufia/plan9stats;name=plan9stats;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/lufia/plan9stats"
 
 #       github.com/mattn/go-colorable v0.1.12
 # [1] git ls-remote https://github.com/mattn/go-colorable e1bb79c8d53c38a60962ad4b8f658226cc983710 
-SRCREV_go-colorable="e1bb79c8d53c38a60962ad4b8f658226cc983710"
+SRCREV_go-colorable = "e1bb79c8d53c38a60962ad4b8f658226cc983710"
 SRC_URI += "git://github.com/mattn/go-colorable;name=go-colorable;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-colorable"
 
 #       github.com/mattn/go-runewidth v0.0.13
 # [1] git ls-remote https://github.com/mattn/go-runewidth df1ff59654317c1b5a3f860ffc47402931932104 
-SRCREV_go-runewidth="df1ff59654317c1b5a3f860ffc47402931932104"
+SRCREV_go-runewidth = "df1ff59654317c1b5a3f860ffc47402931932104"
 SRC_URI += "git://github.com/mattn/go-runewidth;name=go-runewidth;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/mattn/go-runewidth"
 
 #       github.com/matttproud/golang_protobuf_extensions v1.0.1
 # [1] git ls-remote https://github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c 
-SRCREV_golang_protobuf_extensions="c12348ce28de40eed0136aa2b644d0ee0650e56c"
+SRCREV_golang_protobuf_extensions = "c12348ce28de40eed0136aa2b644d0ee0650e56c"
 SRC_URI += "git://github.com/matttproud/golang_protobuf_extensions;name=golang_protobuf_extensions;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/matttproud/golang_protobuf_extensions"
 
 #       github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
 # [1] git ls-remote https://github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 
-SRCREV_concurrent="bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+SRCREV_concurrent = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
 SRC_URI += "git://github.com/modern-go/concurrent;name=concurrent;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/modern-go/concurrent"
 
 #       github.com/modern-go/reflect2 v1.0.2
 # [1] git ls-remote https://github.com/modern-go/reflect2 2b33151c9bbc5231aea69b8861c540102b087070 
-SRCREV_reflect2="2b33151c9bbc5231aea69b8861c540102b087070"
+SRCREV_reflect2 = "2b33151c9bbc5231aea69b8861c540102b087070"
 SRC_URI += "git://github.com/modern-go/reflect2;name=reflect2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/modern-go/reflect2"
 
 #       github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b
 # [1] git ls-remote https://github.com/muesli/ansi 2e021307bc4b4f4766c3fb4faf6030b13dc9ec51 
-SRCREV_ansi="2e021307bc4b4f4766c3fb4faf6030b13dc9ec51"
+SRCREV_ansi = "2e021307bc4b4f4766c3fb4faf6030b13dc9ec51"
 SRC_URI += "git://github.com/muesli/ansi;name=ansi;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/muesli/ansi"
 
 #       github.com/muesli/reflow v0.3.0
 # [1] git ls-remote https://github.com/muesli/reflow 602e329532049c9e33fa8c74e352a46fb9486947 
-SRCREV_reflow="602e329532049c9e33fa8c74e352a46fb9486947"
+SRCREV_reflow = "602e329532049c9e33fa8c74e352a46fb9486947"
 SRC_URI += "git://github.com/muesli/reflow;name=reflow;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/muesli/reflow"
 
 #       github.com/muesli/termenv v0.11.1-0.20220204035834-5ac8409525e0
 # [1] git ls-remote https://github.com/muesli/termenv 5ac8409525e03ee6cd96daeae32d47902b88f32a 
-SRCREV_termenv="5ac8409525e03ee6cd96daeae32d47902b88f32a"
+SRCREV_termenv = "5ac8409525e03ee6cd96daeae32d47902b88f32a"
 SRC_URI += "git://github.com/muesli/termenv;name=termenv;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/muesli/termenv"
 
 #       github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
 # [1] git ls-remote https://github.com/niemeyer/pretty a10e7caefd8e0d600cea437f5c3613aeb1553d56 
-SRCREV_pretty="a10e7caefd8e0d600cea437f5c3613aeb1553d56"
+SRCREV_pretty = "a10e7caefd8e0d600cea437f5c3613aeb1553d56"
 SRC_URI += "git://github.com/niemeyer/pretty;name=pretty;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/niemeyer/pretty"
 
 #       github.com/philhofer/fwd v1.1.1
 # [1] git ls-remote https://github.com/philhofer/fwd 9bcb9cab1b0394d8516a132ec243ba944efdb644 
-SRCREV_fwd="9bcb9cab1b0394d8516a132ec243ba944efdb644"
+SRCREV_fwd = "9bcb9cab1b0394d8516a132ec243ba944efdb644"
 SRC_URI += "git://github.com/philhofer/fwd;name=fwd;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/philhofer/fwd"
 
 #       github.com/pkg/errors v0.9.1
 # [1] git ls-remote https://github.com/pkg/errors 614d223910a179a466c1767a985424175c39b465 
-SRCREV_errors="614d223910a179a466c1767a985424175c39b465"
+SRCREV_errors = "614d223910a179a466c1767a985424175c39b465"
 SRC_URI += "git://github.com/pkg/errors;name=errors;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/pkg/errors"
 
 #       github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c
 # [1] git ls-remote https://github.com/power-devops/perfstat 5aafc221ea8c1ff54b0835cbd5f2386a8410be11 
-SRCREV_perfstat="5aafc221ea8c1ff54b0835cbd5f2386a8410be11"
+SRCREV_perfstat = "5aafc221ea8c1ff54b0835cbd5f2386a8410be11"
 SRC_URI += "git://github.com/power-devops/perfstat;name=perfstat;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/power-devops/perfstat"
 
 #       github.com/prometheus/common v0.33.0
 # [1] git ls-remote https://github.com/prometheus/common 63e75f51cd2368130efbd51b95a4e457e64b444e 
-SRCREV_common="63e75f51cd2368130efbd51b95a4e457e64b444e"
+SRCREV_common = "63e75f51cd2368130efbd51b95a4e457e64b444e"
 SRC_URI += "git://github.com/prometheus/common;name=common;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/common"
 
 #       github.com/prometheus/procfs v0.7.3
 # [1] git ls-remote https://github.com/prometheus/procfs f436cbb89ece38bf080d446b3ca27053b305eaac 
-SRCREV_procfs="f436cbb89ece38bf080d446b3ca27053b305eaac"
+SRCREV_procfs = "f436cbb89ece38bf080d446b3ca27053b305eaac"
 SRC_URI += "git://github.com/prometheus/procfs;name=procfs;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/prometheus/procfs"
 
 #       github.com/rivo/uniseg v0.2.0
 # [1] git ls-remote https://github.com/rivo/uniseg 75711fccf6a3e85bc74c241e2dddd06a9bc9e53d 
-SRCREV_uniseg="75711fccf6a3e85bc74c241e2dddd06a9bc9e53d"
+SRCREV_uniseg = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d"
 SRC_URI += "git://github.com/rivo/uniseg;name=uniseg;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/rivo/uniseg"
 
 #       github.com/sirupsen/logrus v1.8.1
 # [1] git ls-remote https://github.com/sirupsen/logrus bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b 
-SRCREV_logrus="bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b"
+SRCREV_logrus = "bdc0db8ead3853c56b7cd1ac2ba4e11b47d7da6b"
 SRC_URI += "git://github.com/sirupsen/logrus;name=logrus;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/sirupsen/logrus"
 
 #       github.com/tidwall/match v1.1.1
 # [1] git ls-remote https://github.com/tidwall/match 4c9fc61b493b7aa0a3d347e9190aa78c5bec09cf 
-SRCREV_match="4c9fc61b493b7aa0a3d347e9190aa78c5bec09cf"
+SRCREV_match = "4c9fc61b493b7aa0a3d347e9190aa78c5bec09cf"
 SRC_URI += "git://github.com/tidwall/match;name=match;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/match"
 
 #       github.com/tidwall/pretty v1.2.0
 # [1] git ls-remote https://github.com/tidwall/pretty aaa765e7476acb0028a854b85675801362cbdaa2 
-SRCREV_pretty1="aaa765e7476acb0028a854b85675801362cbdaa2"
+SRCREV_pretty1 = "aaa765e7476acb0028a854b85675801362cbdaa2"
 SRC_URI += "git://github.com/tidwall/pretty;name=pretty1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tidwall/pretty"
 
 #       github.com/tklauser/go-sysconf v0.3.9
 # [1] git ls-remote https://github.com/tklauser/go-sysconf 746b19d14e19d242c2daa08e0d645c19832c1939 
-SRCREV_go-sysconf="746b19d14e19d242c2daa08e0d645c19832c1939"
+SRCREV_go-sysconf = "746b19d14e19d242c2daa08e0d645c19832c1939"
 SRC_URI += "git://github.com/tklauser/go-sysconf;name=go-sysconf;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tklauser/go-sysconf"
 
 #       github.com/tklauser/numcpus v0.3.0
 # [1] git ls-remote https://github.com/tklauser/numcpus cc3fdd5f3955d53d50d94380963bddd24bd373e2 
-SRCREV_numcpus="cc3fdd5f3955d53d50d94380963bddd24bd373e2"
+SRCREV_numcpus = "cc3fdd5f3955d53d50d94380963bddd24bd373e2"
 SRC_URI += "git://github.com/tklauser/numcpus;name=numcpus;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/tklauser/numcpus"
 
 #       github.com/yusufpapurcu/wmi v1.2.2
 # [1] git ls-remote https://github.com/yusufpapurcu/wmi 253c5f0cb35e666c4c0fc42083824e7c89f0cc8d 
-SRCREV_wmi="253c5f0cb35e666c4c0fc42083824e7c89f0cc8d"
+SRCREV_wmi = "253c5f0cb35e666c4c0fc42083824e7c89f0cc8d"
 SRC_URI += "git://github.com/yusufpapurcu/wmi;name=wmi;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/yusufpapurcu/wmi"
 
 #       go.etcd.io/etcd/api/v3 v3.5.2
 # [1] git ls-remote https://github.com/etcd-io/etcd 4591a096d4d3c08e577d7269851938db0c1da3d4 
-SRCREV_v31="4591a096d4d3c08e577d7269851938db0c1da3d4"
+SRCREV_v31 = "4591a096d4d3c08e577d7269851938db0c1da3d4"
 SRC_URI += "git://github.com/etcd-io/etcd;name=v31;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/etcd-io/etcd/api/v3"
 
 #       go.uber.org/atomic v1.9.0
 # [1] git ls-remote https://github.com/uber-go/atomic 135466e2d0c8f8adf4d37dc757e3df0ebdd0dfe8 
-SRCREV_atomic="135466e2d0c8f8adf4d37dc757e3df0ebdd0dfe8"
+SRCREV_atomic = "135466e2d0c8f8adf4d37dc757e3df0ebdd0dfe8"
 SRC_URI += "git://github.com/uber-go/atomic;name=atomic;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.uber.org/atomic"
 
 #       go.uber.org/multierr v1.7.0
 # [1] git ls-remote https://github.com/uber-go/multierr 19d9fff1d3b66750a134671435786579bc994737 
-SRCREV_multierr="19d9fff1d3b66750a134671435786579bc994737"
+SRCREV_multierr = "19d9fff1d3b66750a134671435786579bc994737"
 SRC_URI += "git://github.com/uber-go/multierr;name=multierr;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.uber.org/multierr"
 
 #       go.uber.org/zap v1.19.1
 # [1] git ls-remote https://github.com/uber-go/zap 2f61e97148e69cd2dd1902b03e89ce07cd1218a1 
-SRCREV_zap="2f61e97148e69cd2dd1902b03e89ce07cd1218a1"
+SRCREV_zap = "2f61e97148e69cd2dd1902b03e89ce07cd1218a1"
 SRC_URI += "git://github.com/uber-go/zap;name=zap;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.uber.org/zap"
 
 #       golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 # [1] git ls-remote https://go.googlesource.com/sync 036812b2e83c0ddf193dd5a34e034151da389d09 
-SRCREV_sync="036812b2e83c0ddf193dd5a34e034151da389d09"
+SRCREV_sync = "036812b2e83c0ddf193dd5a34e034151da389d09"
 SRC_URI += "git://go.googlesource.com/sync;name=sync;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sync"
 
 #       golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
 # [1] git ls-remote https://go.googlesource.com/sys 33da011f77ade50ff5b6a6fb4a9a1e6d6b285809 
-SRCREV_sys="33da011f77ade50ff5b6a6fb4a9a1e6d6b285809"
+SRCREV_sys = "33da011f77ade50ff5b6a6fb4a9a1e6d6b285809"
 SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/go.googlesource.com/sys"
 
 #       google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb
 # [1] git ls-remote https://github.com/googleapis/go-genproto 3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3 
-SRCREV_genproto="3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3"
+SRCREV_genproto = "3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3"
 SRC_URI += "git://github.com/googleapis/go-genproto;name=genproto;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/genproto"
 
 #       google.golang.org/grpc v1.43.0
 # [1] git ls-remote https://github.com/grpc/grpc-go 14c11384b76b67f7b1b32a5d18f865762634c0ae 
-SRCREV_grpc="14c11384b76b67f7b1b32a5d18f865762634c0ae"
+SRCREV_grpc = "14c11384b76b67f7b1b32a5d18f865762634c0ae"
 SRC_URI += "git://github.com/grpc/grpc-go;name=grpc;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/grpc"
 
 #       google.golang.org/protobuf v1.27.1
 # [1] git ls-remote https://github.com/protocolbuffers/protobuf-go b92717ecb630d4a4824b372bf98c729d87311a4d 
-SRCREV_protobuf12="b92717ecb630d4a4824b372bf98c729d87311a4d"
+SRCREV_protobuf12 = "b92717ecb630d4a4824b372bf98c729d87311a4d"
 SRC_URI += "git://github.com/protocolbuffers/protobuf-go;name=protobuf12;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/google.golang.org/protobuf"
 
 #       gopkg.in/ini.v1 v1.66.3
 # [1] git ls-remote https://gopkg.in/ini.v1 fcd6cc399e588727c1231f4ea187d1b963536bcc 
-SRCREV_ini.v1="fcd6cc399e588727c1231f4ea187d1b963536bcc"
+SRCREV_ini.v1 = "fcd6cc399e588727c1231f4ea187d1b963536bcc"
 SRC_URI += "git://gopkg.in/ini.v1;name=ini.v1;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/ini.v1"
 
 #       gopkg.in/yaml.v3 v3.0.1
 # [1] git ls-remote https://gopkg.in/yaml.v3 f6f7691b1fdeb513f56608cd2c32c51f8194bf51 
-SRCREV_yaml.v3="f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
+SRCREV_yaml.v3 = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
 SRC_URI += "git://gopkg.in/yaml.v3;name=yaml.v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/yaml.v3"
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
deleted file mode 100644
index 38496ea56c..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 7 Oct 2021 12:44:18 +0200
-Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize'
- names
-
-The outcome is that processed names no longer match our custom rust
-target definitions, and the build fails.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
----
- build/moz.configure/init.configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/build/moz.configure/init.configure
-+++ b/build/moz.configure/init.configure
-@@ -647,24 +647,7 @@ def help_host_target(help, host, target)
- 
- def config_sub(shell, triplet):
-     config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
--    # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
--    # munge those before and after calling config.sub.
--    suffix = None
--    munging = {
--        "-windows-msvc": "-mingw32",
--        "-windows-gnu": "-mingw32",
--    }
--    for check_suffix, replacement in munging.items():
--        if triplet.endswith(check_suffix):
--            suffix = check_suffix
--            triplet = triplet[: -len(suffix)] + replacement
--            break
--    result = check_cmd_output(shell, config_sub, triplet).strip()
--    if suffix:
--        assert result.endswith(replacement)
--        result = result[: -len(replacement)] + suffix
--    return result
--
-+    return triplet
- 
- @depends("--host", shell)
- @checking("for host system type", lambda h: h.alias)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch
deleted file mode 100644
index 4c45955bca..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/armv5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-The ISB instruction isn't available in ARMv5 or v6, so
-guard it's use to fix the build on qemuarmv5.
-
-Upstream-Status: Pending
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp
---- a/js/src/jit/arm/Architecture-arm.cpp       2024-01-18 17:31:32.078718197 +0000
-+++ b/js/src/jit/arm/Architecture-arm.cpp       2024-01-18 18:00:16.738921445 +0000
-@@ -529,7 +529,9 @@
- void FlushExecutionContext() {
- #ifndef JS_SIMULATOR_ARM
-+#if __ARM_ARCH >= 7
-   // Ensure that any instructions already in the pipeline are discarded and
-   // reloaded from the icache.
-   asm volatile("isb\n" : : : "memory");
-+#endif
- #else
-   // We assume the icache flushing routines on other platforms take care of this
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch b/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch
deleted file mode 100644
index 22f31e05f8..0000000000
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/fix-musl-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e4d8016d0dc56b02e22898d83aad9f80a94d1c3c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 20 Oct 2021 16:21:14 -0700
-Subject: [PATCH] mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD
-
-Upstream: No
-Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD:
-https://github.com/void-linux/void-packages/issues/2598
-
----
-Upstream-Status: Pending
-
- js/src/old-configure.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index cabd72a2b6..0f08d91cbf 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -807,6 +807,9 @@ if test "$ac_cv_thread_keyword" = yes; then
-     *-android*|*-linuxandroid*)
-       :
-       ;;
-+    *-musl*)
-+      :
-+      ;;
-     *)
-       AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
-       ;;
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch
index e8dfdea1e9..97a4439628 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Cargo.toml-do-not-abort-on-panic.patch
@@ -1,4 +1,4 @@
-From f501f7c02df4f0ff5d5f100d9eeb74cd4d12ea3d Mon Sep 17 00:00:00 2001
+From ddd23f8547f3a56aa542924aa400d3535f734bff Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:00:24 +0200
 Subject: [PATCH] Cargo.toml: do not abort on panic
@@ -7,16 +7,15 @@ OE's rust is configured to unwind, and this setting clashes with it/
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  Cargo.toml | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index a2718b2f35..4e231c30e8 100644
+index a4248187be..eed8964b3a 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -59,13 +59,11 @@ opt-level = 1
+@@ -67,13 +67,11 @@ opt-level = 1
  rpath = false
  lto = false
  debug-assertions = true
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
new file mode 100644
index 0000000000..4fb7a28eeb
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch
@@ -0,0 +1,27 @@
+From cbb5cc1022cc27edefc8eabbe21458cac9bda6fb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 23 Nov 2024 13:28:33 -0800
+Subject: [PATCH] Link with icu-uc to fix build with ICU-76
+
+Fixes
+https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ js/moz.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/moz.configure b/js/moz.configure
+index 593b93acee..2181dca34b 100644
+--- a/js/moz.configure
++++ b/js/moz.configure
+@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_system_icu):
+     return enable_system_icu
+ 
+ 
+-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
++system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc", when="--with-system-icu")
+ 
+ 
+ @depends(enable_system_icu_option)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
index 83187861c7..960b4593c2 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-add-arm-to-list-of-mozinline.patch
@@ -1,4 +1,4 @@
-From c5cfb8aa591afd5ad3aedc58fe7f410e89013605 Mon Sep 17 00:00:00 2001
+From 2d1fb35bd81acadc12cc077de86361ac59cee2f1 Mon Sep 17 00:00:00 2001
 From: Kai Kang <kai.kang@windriver.com>
 Date: Fri, 22 Sep 2023 22:59:59 +0000
 Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
@@ -12,16 +12,15 @@ Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for
 Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
 ---
  js/src/jit/GenerateAtomicOperations.py | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py
-index 24b5a191cf..e41948c5af 100644
+index 9194b8b685..145563bb37 100644
 --- a/js/src/jit/GenerateAtomicOperations.py
 +++ b/js/src/jit/GenerateAtomicOperations.py
-@@ -860,7 +860,7 @@ def generate_atomics_header(c_out):
+@@ -850,7 +850,7 @@ def generate_atomics_header(c_out):
  
          # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE.
          # See bug 1756347.
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
index 83f384e6c2..94e1651b33 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-rewrite-cargo-host-linker-in-python3.patch
@@ -1,4 +1,4 @@
-From c6a84863454b882695058187cd282987613474ef Mon Sep 17 00:00:00 2001
+From 6f6b78628a8edc834aa147c87ebce3eb8e670e7a Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 18 Nov 2021 07:16:39 +0000
 Subject: [PATCH] Rewrite cargo-host-linker in python3
@@ -18,7 +18,6 @@ rewrite cargo-host-linker in python3
 Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
 ---
  build/cargo-host-linker | 24 +++++++++++++++++++++---
  1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
index 4921a9028c..d53cc2bd41 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-util.configure-fix-one-occasionally-reproduced-confi.patch
@@ -1,4 +1,4 @@
-From 0d28cd65efe14022e1d645db71dec74f11ab2ae8 Mon Sep 17 00:00:00 2001
+From 683cd23dd269509a1d913adb2b049b84771e0a94 Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Thu, 11 Nov 2021 16:05:54 +0800
 Subject: [PATCH] util.configure: fix one occasionally reproduced configure
@@ -28,16 +28,15 @@ It should be another process that deleted this file by using
 Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667]
 
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
 ---
  build/moz.configure/util.configure | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
-index f5ff3acd79..44f69deceb 100644
+index d93b91fcdd..47ab8b92b9 100644
 --- a/build/moz.configure/util.configure
 +++ b/build/moz.configure/util.configure
-@@ -254,7 +254,7 @@ def try_invoke_compiler(
+@@ -256,7 +256,7 @@ def try_invoke_compiler(
          "C++": ".cpp",
      }[language]
  
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch
index 4c69155a68..9a82acf77b 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0002-moz.configure-do-not-look-for-llvm-objdump.patch
@@ -1,4 +1,4 @@
-From 49cb509abd309e3b74ef4c872ae773f18dabca19 Mon Sep 17 00:00:00 2001
+From 1a5331f1997788e9a25bbc2b10eb14e2ee418be9 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:01:10 +0200
 Subject: [PATCH] moz.configure: do not look for llvm-objdump
@@ -8,17 +8,16 @@ for js builds.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  moz.configure | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/moz.configure b/moz.configure
-index 3a9461200d..33b3f49b0c 100755
+index 804b9a375a..402e79e3b3 100755
 --- a/moz.configure
 +++ b/moz.configure
-@@ -723,15 +723,15 @@ check_prog(
- )
+@@ -390,15 +390,15 @@ def plain_llvm_or_prefixed(name, llvm_name=None):
+     return plain_llvm_or_prefixed
  
  
 -llvm_objdump = check_prog(
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
index 0f9d062205..40025fbc68 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch
@@ -1,4 +1,4 @@
-From ac6a3711917ff3f2b64662cbf4681c22a09da403 Mon Sep 17 00:00:00 2001
+From 2d7f06cdf631e4d4d94e9d8e33a953dc57672750 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 1 Oct 2021 13:02:17 +0200
 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target
@@ -7,13 +7,12 @@ OE is using custom targets and so this is bound to fail.
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
-
 ---
  build/moz.configure/rust.configure | 34 ++----------------------------
  1 file changed, 2 insertions(+), 32 deletions(-)
 
 diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
-index 7a2fd1ae70..e11f13b253 100644
+index acac34ec05..ff3b8fc0fd 100644
 --- a/build/moz.configure/rust.configure
 +++ b/build/moz.configure/rust.configure
 @@ -486,33 +486,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch
index 6443d46b2c..eb3ff452b3 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/0004-use-asm-sgidefs.h.patch
@@ -1,4 +1,4 @@
-From 607aa4d822b0e074ae1b2fc16d7c140c3e889680 Mon Sep 17 00:00:00 2001
+From 1691939a22ec12245f008993e0b9a1b1dfb91e9c Mon Sep 17 00:00:00 2001
 From: Andre McCurdy <amccurdy@gmail.com>
 Date: Sat, 30 Apr 2016 15:29:06 -0700
 Subject: [PATCH] use <asm/sgidefs.h>
@@ -18,7 +18,6 @@ Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
 Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-
 ---
  mfbt/RandomNum.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
new file mode 100644
index 0000000000..564f423fb4
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/armv5.patch
@@ -0,0 +1,28 @@
+From 0dd6fdbf6a821898617f1bd8e57123be048c07f5 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 16 Dec 2024 05:49:57 +0000
+Subject: [PATCH] The ISB instruction isn't available in ARMv5 or v6, so guard
+ it's use to fix the build on qemuarmv5.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ js/src/jit/arm/Architecture-arm.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp
+index d4c5026705..fc0455eaff 100644
+--- a/js/src/jit/arm/Architecture-arm.cpp
++++ b/js/src/jit/arm/Architecture-arm.cpp
+@@ -528,9 +528,11 @@ void FlushICache(void* code, size_t size) {
+ 
+ void FlushExecutionContext() {
+ #ifndef JS_SIMULATOR_ARM
++#if __ARM_ARCH >= 7
+   // Ensure that any instructions already in the pipeline are discarded and
+   // reloaded from the icache.
+   asm volatile("isb\n" : : : "memory");
++#endif
+ #else
+   // We assume the icache flushing routines on other platforms take care of this
+ #endif
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
index 590cddfe5f..3d5452ce4d 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/musl-disable-stackwalk.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/musl-disable-stackwalk.patch
@@ -1,27 +1,27 @@
-From 9aae71c6ee73431d2609be0ef74ffd4b22b36c75 Mon Sep 17 00:00:00 2001
+From d96e9a40e9da9163e0a4b3475178fe30c26deb19 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 22 Sep 2023 22:59:56 +0000
 Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can
+
  not assume that its always available on musl, we do need to check for target
  environment as well which could be musl or glibc.
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  mozglue/misc/StackWalk.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
-index 307715b170..a8d3cb40c0 100644
+index 18fd3464b0..d3d9208fdb 100644
 --- a/mozglue/misc/StackWalk.cpp
 +++ b/mozglue/misc/StackWalk.cpp
-@@ -43,7 +43,7 @@ using namespace mozilla;
- #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+@@ -50,7 +50,7 @@ using namespace mozilla;
+ #  define HAVE___LIBC_STACK_END 0
  #endif
  
 -#if (defined(linux) &&                                            \
 +#if (defined(linux) && defined(__GLIBC__) &&                      \
       ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
-       defined(HAVE__UNWIND_BACKTRACE)))
- #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
+       defined(HAVE__UNWIND_BACKTRACE)) &&                         \
+      (HAVE___LIBC_STACK_END || ANDROID))
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
new file mode 100644
index 0000000000..cb2dc66525
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv.patch
@@ -0,0 +1,30 @@
+Recognise riscv64gc and riscv32gc as valid architectures
+
+Rust uses above for architecture in tuples
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
++++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(Bas
+         "mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
+         "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
+         "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
++        "riscv32gc-unknown-linux-gnu": little_endian
++        + {"__riscv": 1, "__riscv_xlen": 32},
++        "riscv64gc-unknown-linux-gnu": little_endian
++        + {"__riscv": 1, "__riscv_xlen": 64},
+         "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1},
+     }
+ 
+--- a/build/autoconf/config.sub
++++ b/build/autoconf/config.sub
+@@ -1236,7 +1236,7 @@ case $cpu-$vendor in
+                        | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
+                        | pru \
+                        | pyramid \
+-                       | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
++                       | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \
+                        | rl78 | romp | rs6000 | rx \
+                        | s390 | s390x \
+                        | score \
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
index 16f95659e2..67e23c5fcc 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115/riscv32.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/riscv32.patch
@@ -1,11 +1,10 @@
-From d6aff068170e56e6773feba42a463dd8c50bc4ff Mon Sep 17 00:00:00 2001
+From 0cc41bc953974d4852b263708bf8d12f823ca8ad Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 24 Oct 2021 22:32:50 -0700
 Subject: [PATCH] Add RISCV32 support
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  build/moz.configure/init.configure                             | 3 +++
  python/mozbuild/mozbuild/configure/constants.py                | 2 ++
@@ -13,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  3 files changed, 6 insertions(+)
 
 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index 53bbc4203f..2ac40d3d39 100644
+index 97b9bab167..d9a5a2035d 100644
 --- a/build/moz.configure/init.configure
 +++ b/build/moz.configure/init.configure
-@@ -584,6 +584,9 @@ def split_triplet(triplet, allow_wasi=False):
+@@ -594,6 +594,9 @@ def split_triplet(triplet, allow_wasi=False):
      elif cpu.startswith("aarch64"):
          canonical_cpu = "aarch64"
          endianness = "little"
@@ -27,10 +26,10 @@ index 53bbc4203f..2ac40d3d39 100644
          canonical_cpu = "riscv64"
          endianness = "little"
 diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
-index a36152651d..a6050be5d8 100644
+index 25f43bb9f8..3335e69405 100644
 --- a/python/mozbuild/mozbuild/configure/constants.py
 +++ b/python/mozbuild/mozbuild/configure/constants.py
-@@ -51,6 +51,7 @@ CPU_bitness = {
+@@ -73,6 +73,7 @@ CPU_bitness = {
      "mips64": 64,
      "ppc": 32,
      "ppc64": 64,
@@ -38,7 +37,7 @@ index a36152651d..a6050be5d8 100644
      "riscv64": 64,
      "s390": 32,
      "s390x": 64,
-@@ -98,6 +99,7 @@ CPU_preprocessor_checks = OrderedDict(
+@@ -129,6 +130,7 @@ CPU_preprocessor_checks = OrderedDict(
          ("m68k", "__m68k__"),
          ("mips64", "__mips64"),
          ("mips32", "__mips__"),
@@ -47,7 +46,7 @@ index a36152651d..a6050be5d8 100644
          ("loongarch64", "__loongarch64"),
          ("sh4", "__sh__"),
 diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
-index c6af3d99d4..7ef02e1a85 100644
+index d438b68eb8..1be0d02e54 100644
 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
 @@ -1325,6 +1325,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-115_115.8.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
index 1269795d20..ceb81d07e5 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-115_115.8.0.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
@@ -8,22 +8,25 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
            file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
            file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
            file://0004-use-asm-sgidefs.h.patch \
-           file://fix-musl-build.patch \
-           file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \
            file://riscv32.patch \
            file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
            file://0001-rewrite-cargo-host-linker-in-python3.patch  \
            file://musl-disable-stackwalk.patch \
            file://0001-add-arm-to-list-of-mozinline.patch \
            file://armv5.patch \
+           file://0001-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
+           file://riscv.patch \
            "
-SRC_URI[sha256sum] = "af8086f23efc8492d286671f6035b1a915de6f4ed5c7897e40be0e1cb6b895ea"
+SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f"
 
-S = "${WORKDIR}/firefox-${PV}"
+UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
-inherit pkgconfig perlnative python3native rust
+S = "${UNPACKDIR}/firefox-${PV}"
 
-DEPENDS += "zlib cargo-native python3 icu"
+inherit pkgconfig perlnative python3native rust cargo
+
+DEPENDS += "zlib cbindgen-native python3 icu"
 DEPENDS:remove:mipsarch = "icu"
 DEPENDS:remove:powerpc:toolchain-clang = "icu"
 
@@ -54,6 +57,7 @@ export HOST_CXXFLAGS = "${BUILD_CXXFLAGS}"
 
 export AS = "${CC}"
 
+export MOZBUILD_STATE_PATH = "${WORKDIR}/mozbuild_state"
 export RUSTFLAGS
 
 JIT ?= ""
@@ -62,6 +66,8 @@ ICU ?= "--with-system-icu"
 ICU:mipsarch = ""
 ICU:powerpc:toolchain-clang = ""
 
+LDFLAGS:append:riscv32 = " -latomic"
+
 do_configure() {
     cd ${B}
     python3 ${S}/configure.py \
@@ -77,6 +83,13 @@ do_configure() {
 }
 do_configure[cleandirs] += "${B}"
 
+# The main build system is a Makefile that call cargo downstream.
+# We inherit cargo to get the environnement but need to switch back to
+# base_do_compile to do the Makefile base compilation.
+do_compile() {
+    base_do_compile
+}
+
 do_install() {
     oe_runmake 'DESTDIR=${D}' install
 }
@@ -93,6 +106,7 @@ do_install:append() {
     rm -f ${D}${libdir}/libjs_static.ajs
 }
 
+INSANE_SKIP += "32bit-time"
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 PACKAGES =+ "lib${BPN}"
 FILES:lib${BPN} += "${libdir}/lib*"
diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb
index 4d3baf6caa..b53be9803e 100644
--- a/meta-oe/recipes-extended/mraa/mraa_git.bb
+++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
@@ -14,7 +14,6 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
            file://0002-gpio-Include-limits.h-for-PATH_MAX.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # CMakeLists.txt checks the architecture, only x86 and ARM supported for now
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
@@ -41,11 +40,11 @@ FILES:${PN}-utils = "${bindir}/"
 # will result in only the python bindings being built/packaged.
 # Note: 'nodejs' is disabled by default because the bindings
 # generation currently fails with nodejs (>v7.x).
-BINDINGS ??= "python"
+BINDINGS ??= ""
 
 # nodejs isn't available for armv4/armv5 architectures
-BINDINGS:armv4 ??= "python"
-BINDINGS:armv5 ??= "python"
+BINDINGS:armv4 ??= ""
+BINDINGS:armv5 ??= ""
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
  ${@bb.utils.contains('PACKAGES', 'python3-${PN}', 'python', '', d)}"
diff --git a/meta-oe/recipes-extended/nana/nana_git.bb b/meta-oe/recipes-extended/nana/nana_git.bb
index 7c748bc49b..bad5a797a7 100644
--- a/meta-oe/recipes-extended/nana/nana_git.bb
+++ b/meta-oe/recipes-extended/nana/nana_git.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/pjmaker/nana;protocol=https;branch=master \
     file://0001-Makefile.am-fix-build-with-separate-build-dir.patch \
     file://0002-man-Makefile.am-we-seem-not-to-need-the-work-around-.patch \
 "
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-2-Clause"
 
@@ -42,3 +41,9 @@ do_configure:prepend:class-nativesdk() {
 }
 
 BBCLASSEXTEND = "native nativesdk"
+
+do_install:append() {
+    sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-c++lg
+    sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana-clg
+    sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' ${D}${bindir}/nana
+}
diff --git a/meta-oe/recipes-extended/networking/mstpd_git.bb b/meta-oe/recipes-extended/networking/mstpd_git.bb
index b2043ef062..b003b52d25 100644
--- a/meta-oe/recipes-extended/networking/mstpd_git.bb
+++ b/meta-oe/recipes-extended/networking/mstpd_git.bb
@@ -9,7 +9,6 @@ SRC_URI = " \
     file://mstpd.service \
 "
 SRCREV = "181c453fc1a00573e19f14960dcc54ad84beea7c"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+){2,})"
 
@@ -26,8 +25,8 @@ do_install:append() {
     rmdir ${D}${libdir} || true
 
     install -d -m 0755 ${D}${sbindir}
-    install -m 0755 ${WORKDIR}/bridge-stp ${D}${sbindir}
+    install -m 0755 ${UNPACKDIR}/bridge-stp ${D}${sbindir}
 
     install -d -m 0755 ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/mstpd.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/mstpd.service ${D}${systemd_system_unitdir}
 }
diff --git a/meta-oe/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch b/meta-oe/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch
new file mode 100644
index 0000000000..bc55582fd9
--- /dev/null
+++ b/meta-oe/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch
@@ -0,0 +1,26 @@
+From fad40cfc18a42946a9a9e440c3434cd6b847ff9d Mon Sep 17 00:00:00 2001
+From: Otavio Salvador <otavio@ossystems.com.br>
+Date: Mon, 18 Jan 2016 17:05:19 +0000
+Subject: [PATCH] Makefile.in: Add tinfo library to the linking libraries
+Organization: O.S. Systems Software LTDA.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a85d00f..98b85f9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-LIBS = -lslang @LIBS@
++LIBS = -lslang -ltinfo @LIBS@
+ LIBTCL = @TCL_LIB_FLAG@
+ 
+ CC = @CC@
+-- 
+2.1.4
+
diff --git a/meta-oe/recipes-extended/newt/files/cross_ar.patch b/meta-oe/recipes-extended/newt/files/cross_ar.patch
new file mode 100644
index 0000000000..eb8c4134b2
--- /dev/null
+++ b/meta-oe/recipes-extended/newt/files/cross_ar.patch
@@ -0,0 +1,59 @@
+From 0f33421000006f5991d1cddcb9dbc68b64141e44 Mon Sep 17 00:00:00 2001
+From: Jason Wessel <jason.wessel@windriver.com>
+Date: Wed, 19 Jun 2024 11:22:48 +0200
+Subject: [PATCH] Fix cross link using autoconf detected AR
+
+If building on 32bit host and creating 64bit libraries, the target
+package builds should not invoke the 32bit hosts's ar.  Specifically
+you will get an error message like:
+
+x86_64-linux-gcc    -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -g -o test test.o libnewt.a -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lslang
+libnewt.a: could not read symbols: Archive has no index; run ranlib to add one
+collect2: error: ld returned 1 exit status
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ Makefile.in  | 3 ++-
+ configure.ac | 4 ++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f8fe290..8a44a56 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
+ GNU_LD = @GNU_LD@
++AR = @AR@
+ 
+ VERSION = @VERSION@
+ TAG = r$(subst .,-,$(VERSION))
+@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNEWTSH)
+        $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt  $(LIBTCL) -lpopt $(LIBS)
+ 
+ $(LIBNEWT): $(LIBOBJS)
+-       ar rv $@ $^
++       $(AR) rv $@ $^
+ 
+ newt.o $(SHAREDDIR)/newt.o: newt.c Makefile
+ 
+diff --git a/configure.ac b/configure.ac
+index 434121e..2cfffd6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,6 +15,10 @@ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_PROG_GREP
+ AC_SYS_LARGEFILE
++AN_MAKEVAR([AR], [AC_PROG_AR])
++AN_PROGRAM([ar], [AC_PROG_AR])
++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])
++AC_PROG_AR
+ 
+ AC_CHECK_SIZEOF([long])
+ AC_CHECK_SIZEOF([long long])
diff --git a/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb b/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
new file mode 100644
index 0000000000..18a45a3342
--- /dev/null
+++ b/meta-oe/recipes-extended/newt/libnewt_0.52.25.bb
@@ -0,0 +1,55 @@
+SUMMARY = "A library for text mode user interfaces"
+
+DESCRIPTION = "Newt is a programming library for color text mode, widget based user \
+interfaces.  Newt can be used to add stacked windows, entry widgets, \
+checkboxes, radio buttons, labels, plain text fields, scrollbars, \
+etc., to text mode user interfaces.  This package also contains the \
+shared library needed by programs built with newt, as well as a \
+/usr/bin/dialog replacement called whiptail.  Newt is based on the \
+slang library."
+
+HOMEPAGE = "https://releases.pagure.org/newt/"
+SECTION = "libs"
+
+LICENSE = "LGPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
+
+# slang needs to be >= 2.2
+DEPENDS = "slang popt python3"
+
+SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \
+           file://cross_ar.patch \
+           file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \
+           "
+
+SRC_URI[sha256sum] = "ef0ca9ee27850d1a5c863bb7ff9aa08096c9ed312ece9087b30f3a426828de82"
+
+S = "${UNPACKDIR}/newt-${PV}"
+
+inherit autotools-brokensep python3native python3-dir python3targetconfig
+
+EXTRA_OECONF = "--without-tcl --with-python"
+
+EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}"
+
+CLEANBROKEN = "1"
+
+export CPPFLAGS
+
+PACKAGES:prepend = "whiptail ${PN}-python "
+
+RDEPENDS:${PN}-python += "python3-core"
+FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*"
+
+do_configure:prepend() {
+    sh autogen.sh
+}
+
+do_compile:prepend() {
+    # Make sure the recompile is OK
+    rm -f ${B}/.depend
+}
+
+FILES:whiptail = "${bindir}/whiptail"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
index bf742fa062..d5629b06e5 100644
--- a/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
+++ b/meta-oe/recipes-extended/nicstat/nicstat_1.95.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4a94da2a1f918b217ef5156634fc9e0"
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-nicstat.c-Do-not-define-uint64_t-and-uint32_t.patch \
            "
-SRC_URI[md5sum] = "9a0b87bbc670c1e738e5b40c7afd184d"
 SRC_URI[sha256sum] = "c4cc33f8838f4523f27c3d7584eedbe59f4c587f0821612f5ac2201adc18b367"
 
 do_compile() {
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
deleted file mode 100644
index df43d25ac3..0000000000
--- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SUMMARY = "Set of CLI tools for Openlmi providers"
-DESCRIPTION = "openlmi-tools is a set of command line tools for Openlmi providers."
-HOMEPAGE = "http://www.openlmi.org/"
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://../COPYING;md5=75859989545e37968a99b631ef42722e"
-SECTION = "System/Management"
-
-inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
-
-SKIP_RECIPE[openlmi-tools] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
-
-DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem"
-
-SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \
-          "
-SRC_URI[md5sum] = "e156246cb7b49753db82f4ddf7f03e50"
-SRC_URI[sha256sum] = "292b8f5f2250655a4add8183c529b73358bc980bd4f23cfa484a940953fce9e4"
-
-S = "${WORKDIR}/${BP}/cli"
-
-do_configure:prepend() {
-    sed 's/@@VERSION@@/$(VERSION)/g' ${S}/setup.py.skel > ${S}/setup.py
-}
-
-python() {
-    if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
-}
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
index 1c68b5f432..970d7fb5fc 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.7.2.bb
@@ -24,7 +24,6 @@ SRC_URI = "git://github.com/Openwsman/openwsman.git;branch=main;protocol=https \
            file://0001-Link-with-libm-for-floor-function.patch \
            "
 
-S = "${WORKDIR}/git"
 
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d4f53d4c6cf73b9d43186ce3be6dd0ba"
@@ -34,8 +33,6 @@ inherit systemd cmake pkgconfig python3native perlnative
 SYSTEMD_SERVICE:${PN} = "openwsmand.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}"
-
 EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \
                  -DBUILD_LIBCIM=NO \
                  -DBUILD_PERL=YES \
@@ -57,7 +54,7 @@ do_install:append() {
     chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}/${systemd_unitdir}/system
-        install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system
+        install -m 644 ${UNPACKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system
 
         sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/openwsmand.service
         sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/openwsmand.service
diff --git a/meta-oe/recipes-extended/ostree/ostree_2024.5.bb b/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
index 2ea92f190c..c33624987a 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2024.5.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2024.10.bb
@@ -22,13 +22,13 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases"
 SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \
            file://run-ptest \
            "
-SRC_URI[sha256sum] = "bc12d8493db64152093ee5be77cf62a29cc67a4a9e430dc987103e78aada4a6f"
+SRC_URI[sha256sum] = "54e3387dee1ff16031a0679aca2b60da90ab7f4a26c211822333c7f23000abee"
 
-S = "${WORKDIR}/libostree-${PV}"
+S = "${UNPACKDIR}/libostree-${PV}"
 
 inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd
 
-UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection"
+UNKNOWN_CONFIGURE_OPT_IGNORE += "--disable-introspection --enable-introspection"
 
 # Workaround compile failure:
 # |../git/src/libotutil/zbase32.c:37:1: error: function returns an aggregate [-Werror=aggregate-return]
@@ -45,7 +45,7 @@ BUILD_OPTIMIZATION:append = " -O2"
 PACKAGECONFIG ??= " \
     ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'soup3 static', '', d)} \
     glib \
     gpgme \
     curl \
@@ -69,6 +69,7 @@ PACKAGECONFIG:class-nativesdk ??= " \
 
 PACKAGECONFIG[avahi] = "--with-avahi, --without-avahi, avahi"
 PACKAGECONFIG[builtin-grub2-mkconfig] = "--with-builtin-grub2-mkconfig, --without-builtin-grub2-mkconfig"
+PACKAGECONFIG[composefs] = "--with-composefs, --without-composefs, composefs"
 PACKAGECONFIG[curl] = "--with-curl, --without-curl, curl"
 PACKAGECONFIG[dracut] = "--with-dracut, --without-dracut"
 PACKAGECONFIG[ed25519-libsodium] = "--with-ed25519-libsodium, --without-ed25519-libsodium, libsodium"
diff --git a/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch b/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
deleted file mode 100644
index 1f08d1603a..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/0001-Fix-narrowing-errors-Wc-11-narrowing.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 653674e11872465dd5edf1c1e8413ea813d7e086 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Apr 2018 23:07:21 -0700
-Subject: [PATCH] Fix narrowing errors -Wc++11-narrowing
-
-Clang 6.x finds these errors
-
-    ../../../../CPP/Windows/ErrorMsg.cpp:24:10: error: case value evaluates to -2147024809, which cannot be narrowed to type 'DWORD' (aka 'unsigned int') [-Wc++11-narrowing]
-        case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-             ^
-
-HRESULT causes the macro to be parsed as a signed long, so we need to force it
-to be checked as an unsigned long instead.
-
-also reported here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224930
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- CPP/Windows/ErrorMsg.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp
-index 99684ae..78a64ba 100644
---- a/CPP/Windows/ErrorMsg.cpp
-+++ b/CPP/Windows/ErrorMsg.cpp
-@@ -15,13 +15,13 @@ UString MyFormatMessage(DWORD errorCode)
- 
-   switch(errorCode) {
-     case ERROR_NO_MORE_FILES   : txt = "No more files"; break ;
--    case E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
--    case E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
--    case E_ABORT               : txt = "E_ABORT"; break ;
--    case E_FAIL                : txt = "E_FAIL"; break ;
--    case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
--    case E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
--    case E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-+    case (DWORD) E_NOTIMPL             : txt = "E_NOTIMPL"; break ;
-+    case (DWORD) E_NOINTERFACE         : txt = "E_NOINTERFACE"; break ;
-+    case (DWORD) E_ABORT               : txt = "E_ABORT"; break ;
-+    case (DWORD) E_FAIL                : txt = "E_FAIL"; break ;
-+    case (DWORD) STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
-+    case (DWORD) E_OUTOFMEMORY         : txt = "E_OUTOFMEMORY"; break ;
-+    case (DWORD) E_INVALIDARG          : txt = "E_INVALIDARG"; break ;
-     case ERROR_DIRECTORY          : txt = "Error Directory"; break ;
-     default:
-       txt = strerror(errorCode);
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
deleted file mode 100644
index 98e186cbf0..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-p7zip: Update CVE-2016-9296 patch URL.
-From: Robert Luberda <robert@debian.org>
-Date: Sat, 19 Nov 2016 08:48:08 +0100
-Subject: Fix nullptr dereference (CVE-2016-9296)
-
-Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
-This patch file taken from Debian's patch set for p7zip
-
-Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/185/]
-CVE: CVE-2016-9296
-
-Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
-
-Index: p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
-===================================================================
---- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp
-+++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
-@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
-       if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
-         ThrowIncorrect();
-   }
--  HeadersSize += folders.PackPositions[folders.NumPackStreams];
-+  if (folders.PackPositions)
-+      HeadersSize += folders.PackPositions[folders.NumPackStreams];
-   return S_OK;
- }
- 
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
deleted file mode 100644
index 9ba1078071..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2017-17969.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7f2da4f810b429ddb7afa0e252e3d02ced0eba87 Mon Sep 17 00:00:00 2001
-From: Radovan Scasny <radovan.scasny@siemens.com>
-Date: Tue, 20 Feb 2018 12:08:13 +0100
-Subject: [PATCH] p7zip: Fix CVE-2017-17969
-
-[No upstream tracking] -- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888297
-
-Heap-based buffer overflow in 7zip
-
-Compress/ShrinkDecoder.cpp: Heap-based buffer overflow
-in the NCompress::NShrink::CDecoder::CodeReal method
-in 7-Zip before 18.00 and p7zip allows remote attackers
-to cause a denial of service (out-of-bounds write)
-or potentially execute arbitrary code via a crafted ZIP archive.
-
-Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/8316/attachment/CVE-2017-17969.patch]
-CVE: CVE-2017-17969
-Signed-off-by: Radovan Scasny <radovan.scasny@siemens.com>
-
----
- CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
-index 80b7e67..5bb0559 100644
---- a/CPP/7zip/Compress/ShrinkDecoder.cpp
-+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp
-@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-     {
-       _stack[i++] = _suffixes[cur];
-       cur = _parents[cur];
-+         if (cur >= kNumItems || i >= kNumItems)
-+               break;
-     }
-+       
-+       if (cur >= kNumItems || i >= kNumItems)
-+               break;
-     
-     _stack[i++] = (Byte)cur;
-     lastChar2 = (Byte)cur;
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch
deleted file mode 100644
index 47868c982e..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2018-5996.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Sun, 28 Jan 2018 23:47:40 +0100
-Subject: CVE-2018-5996
-
-Hopefully fix Memory Corruptions via RAR PPMd (CVE-2018-5996) by
-applying a few changes from 7Zip 18.00-beta.
-
-Bug-Debian: https://bugs.debian.org/#888314
-
-Upstream-Status: Backport [https://sources.debian.org/data/non-free/p/p7zip-rar/16.02-3/debian/patches/06-CVE-2018-5996.patch]
-CVE: CVE-2018-5996
-
-Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
----
- CPP/7zip/Compress/Rar1Decoder.cpp | 13 +++++++++----
- CPP/7zip/Compress/Rar1Decoder.h   |  1 +
- CPP/7zip/Compress/Rar2Decoder.cpp | 10 +++++++++-
- CPP/7zip/Compress/Rar2Decoder.h   |  1 +
- CPP/7zip/Compress/Rar3Decoder.cpp | 23 ++++++++++++++++++++---
- CPP/7zip/Compress/Rar3Decoder.h   |  2 ++
- 6 files changed, 42 insertions(+), 8 deletions(-)
-
-diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp
-index 1aaedcc..68030c7 100644
---- a/CPP/7zip/Compress/Rar1Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar1Decoder.cpp
-@@ -29,7 +29,7 @@ public:
- };
- */
- 
--CDecoder::CDecoder(): m_IsSolid(false) { }
-+CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
- 
- void CDecoder::InitStructures()
- {
-@@ -406,9 +406,14 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-   InitData();
-   if (!m_IsSolid)
-   {
-+    _errorMode = false;
-     InitStructures();
-     InitHuff();
-   }
-+
-+  if (_errorMode)
-+    return S_FALSE;
-+
-   if (m_UnpackSize > 0)
-   {
-     GetFlagsBuf();
-@@ -477,9 +482,9 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress)
- {
-   try { return CodeReal(inStream, outStream, inSize, outSize, progress); }
--  catch(const CInBufferException &e) { return e.ErrorCode; }
--  catch(const CLzOutWindowException &e) { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
-+  catch(const CInBufferException &e) { _errorMode = true; return e.ErrorCode; }
-+  catch(const CLzOutWindowException &e) { _errorMode = true; return e.ErrorCode; }
-+  catch(...) { _errorMode = true; return S_FALSE; }
- }
- 
- STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size)
-diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h
-index 630f089..01b606b 100644
---- a/CPP/7zip/Compress/Rar1Decoder.h
-+++ b/CPP/7zip/Compress/Rar1Decoder.h
-@@ -39,6 +39,7 @@ public:
- 
-   Int64 m_UnpackSize;
-   bool m_IsSolid;
-+  bool _errorMode;
- 
-   UInt32 ReadBits(int numBits);
-   HRESULT CopyBlock(UInt32 distance, UInt32 len);
-diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp
-index b3f2b4b..0580c8d 100644
---- a/CPP/7zip/Compress/Rar2Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar2Decoder.cpp
-@@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20;
- static const UInt32 kWindowReservSize = (1 << 22) + 256;
- 
- CDecoder::CDecoder():
--  m_IsSolid(false)
-+  m_IsSolid(false),
-+  m_TablesOK(false)
- {
- }
- 
-@@ -100,6 +101,8 @@ UInt32 CDecoder::ReadBits(unsigned numBits) { return m_InBitStream.ReadBits(numB
- 
- bool CDecoder::ReadTables(void)
- {
-+  m_TablesOK = false;
-+
-   Byte levelLevels[kLevelTableSize];
-   Byte newLevels[kMaxTableSize];
-   m_AudioMode = (ReadBits(1) == 1);
-@@ -170,6 +173,8 @@ bool CDecoder::ReadTables(void)
-   }
-   
-   memcpy(m_LastLevels, newLevels, kMaxTableSize);
-+  m_TablesOK = true;
-+
-   return true;
- }
- 
-@@ -344,6 +349,9 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
-       return S_FALSE;
-   }
- 
-+  if (!m_TablesOK)
-+    return S_FALSE;
-+
-   UInt64 startPos = m_OutWindowStream.GetProcessedSize();
-   while (pos < unPackSize)
-   {
-diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h
-index 3a0535c..0e9005f 100644
---- a/CPP/7zip/Compress/Rar2Decoder.h
-+++ b/CPP/7zip/Compress/Rar2Decoder.h
-@@ -139,6 +139,7 @@ class CDecoder :
- 
-   UInt64 m_PackSize;
-   bool m_IsSolid;
-+  bool m_TablesOK;
- 
-   void InitStructures();
-   UInt32 ReadBits(unsigned numBits);
-diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp
-index 3bf2513..6cb8a6a 100644
---- a/CPP/7zip/Compress/Rar3Decoder.cpp
-+++ b/CPP/7zip/Compress/Rar3Decoder.cpp
-@@ -92,7 +92,8 @@ CDecoder::CDecoder():
-   _writtenFileSize(0),
-   _vmData(0),
-   _vmCode(0),
--  m_IsSolid(false)
-+  m_IsSolid(false),
-+  _errorMode(false)
- {
-   Ppmd7_Construct(&_ppmd);
- }
-@@ -545,6 +546,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-     return InitPPM();
-   }
- 
-+  TablesRead = false;
-+  TablesOK = false;
-+
-   _lzMode = true;
-   PrevAlignBits = 0;
-   PrevAlignCount = 0;
-@@ -606,6 +610,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-       }
-     }
-   }
-+  if (InputEofError())
-+    return S_FALSE;
-+
-   TablesRead = true;
- 
-   // original code has check here:
-@@ -623,6 +630,9 @@ HRESULT CDecoder::ReadTables(bool &keepDecompressing)
-   RIF(m_LenDecoder.Build(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize]));
- 
-   memcpy(m_LastLevels, newLevels, kTablesSizesSum);
-+
-+  TablesOK = true;
-+
-   return S_OK;
- }
- 
-@@ -824,7 +834,12 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     PpmEscChar = 2;
-     PpmError = true;
-     InitFilters();
-+    _errorMode = false;
-   }
-+
-+  if (_errorMode)
-+    return S_FALSE;
-+
-   if (!m_IsSolid || !TablesRead)
-   {
-     bool keepDecompressing;
-@@ -838,6 +853,8 @@ HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress)
-     bool keepDecompressing;
-     if (_lzMode)
-     {
-+      if (!TablesOK)
-+        return S_FALSE;
-       RINOK(DecodeLZ(keepDecompressing))
-     }
-     else
-@@ -901,8 +918,8 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream
-     _unpackSize = outSize ? *outSize : (UInt64)(Int64)-1;
-     return CodeReal(progress);
-   }
--  catch(const CInBufferException &e)  { return e.ErrorCode; }
--  catch(...) { return S_FALSE; }
-+  catch(const CInBufferException &e)  { _errorMode = true; return e.ErrorCode; }
-+  catch(...) { _errorMode = true; return S_FALSE; }
-   // CNewException is possible here. But probably CNewException is caused
-   // by error in data stream.
- }
-diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h
-index c130cec..2f72d7d 100644
---- a/CPP/7zip/Compress/Rar3Decoder.h
-+++ b/CPP/7zip/Compress/Rar3Decoder.h
-@@ -192,6 +192,7 @@ class CDecoder:
-   UInt32 _lastFilter;
- 
-   bool m_IsSolid;
-+  bool _errorMode;
- 
-   bool _lzMode;
-   bool _unsupportedFilter;
-@@ -200,6 +201,7 @@ class CDecoder:
-   UInt32 PrevAlignCount;
- 
-   bool TablesRead;
-+  bool TablesOK;
- 
-   CPpmd7 _ppmd;
-   int PpmEscChar;
-
diff --git a/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch b/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch
deleted file mode 100644
index 93eb0588c0..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/change_numMethods_from_bool_to_unsigned.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0820ef4b9238c1e39ae5bda32cc08cce3fd3ce89 Mon Sep 17 00:00:00 2001
-From: Nisha Parrakat <Nisha.Parrakat@kpit.com>
-Date: Wed, 26 May 2021 19:59:28 +0000
-Subject: [PATCH] fixes the below error
-
-| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp: In member function 'virtual LONG NArchive::NWim::CHandler::GetArchiveProperty(PROPID, PROPVARIANT*)':
-| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-|   308 |           numMethods++;
-|       |           ^~~~~~~~~~
-| ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:318:9: error: use of an operand of type 'bool' in 'operator++' is forbidden in C++17
-|   318 |         numMethods++;
-
-use unsigned instead of bool
-Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com>
-
-Upstream-Status: Pending
-
----
- CPP/7zip/Archive/Wim/WimHandler.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp
-index 27d3298..4ff5cfe 100644
---- a/CPP/7zip/Archive/Wim/WimHandler.cpp
-+++ b/CPP/7zip/Archive/Wim/WimHandler.cpp
-@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
- 
-       AString res;
- 
--      bool numMethods = 0;
-+      unsigned numMethods = 0;
-       for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++)
-       {
-         if (methodMask & ((UInt32)1 << i))
diff --git a/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch b/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
deleted file mode 100644
index 2636e7f6f4..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/do_not_override_compiler_and_do_not_strip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b2aa209dfc5e59d6329b55b9764782334b63dbe8 Mon Sep 17 00:00:00 2001
-From: Raphael Freudiger <raphael.freudiger@siemens.com>
-Date: Wed, 11 Feb 2015 09:11:47 +0100
-Subject: [PATCH] do not override compiler and do not strip
-
-The default makefile sets the compiler to g++ or gcc. This leads to a wrong architecture when cross-compiling.
-Remove the hardcoded compiler and just append the flags to CXX and CC.
-
-Upstream-Status: Pending
-Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
-Reviewed-By: Pascal Bach <pascal.bach@siemens.com>
-
----
- makefile.machine | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/makefile.machine b/makefile.machine
-index 9e34c34..e9244d9 100644
---- a/makefile.machine
-+++ b/makefile.machine
-@@ -2,7 +2,7 @@
- # makefile for Linux (x86, PPC, alpha ...)
- #
- 
--OPTFLAGS=-O -s
-+OPTFLAGS=-O
- 
- ALLFLAGS=${OPTFLAGS} -pipe \
-        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-@@ -10,8 +10,6 @@ ALLFLAGS=${OPTFLAGS} -pipe \
-        -D_7ZIP_LARGE_PAGES \
-        $(LOCAL_FLAGS)
- 
--CXX=g++
--CC=gcc
- CC_SHARED=-fPIC
- LINK_SHARED=-fPIC -shared
- 
diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
deleted file mode 100644
index e795482eb6..0000000000
--- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SUMMARY = "7-zip is a commandline utility handling 7z archives."
-HOMEPAGE = "http://www.7-zip.org/"
-LICENSE = "LGPL-2.1-or-later & unRAR"
-LIC_FILES_CHKSUM = "file://DOC/copying.txt;md5=4fbd65380cdd255951079008b364516c \
-                    file://DOC/unRarLicense.txt;md5=9c87ddde469ef94aed153b0951d088de \
-                    file://DOC/License.txt;md5=879598edf1f54dddb6930d7581357f8b"
-
-SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_all.tar.bz2 \
-           file://do_not_override_compiler_and_do_not_strip.patch \
-           file://CVE-2017-17969.patch \
-           file://0001-Fix-narrowing-errors-Wc-11-narrowing.patch \
-           file://change_numMethods_from_bool_to_unsigned.patch \
-           file://CVE-2018-5996.patch \
-           file://CVE-2016-9296.patch \
-           "
-
-SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf"
-SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
-
-S = "${WORKDIR}/${BPN}_${PV}"
-
-do_compile:append() {
-    oe_runmake 7z
-}
-FILES:${PN} += "${libdir}/* ${bindir}/7z"
-
-FILES_SOLIBSDEV = ""
-INSANE_SKIP:${PN} += "dev-so"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -d ${D}${bindir}/Codecs
-        install -d ${D}${libdir}
-        install -d ${D}${libdir}/Codecs
-        install -m 0755 ${S}/bin/7za ${D}${bindir}
-        ln -s 7za ${D}${bindir}/7z
-        install -m 0755 ${S}/bin/Codecs/* ${D}${libdir}/Codecs/
-        install -m 0755 ${S}/bin/7z.so ${D}${libdir}/lib7z.so
-}
-
-RPROVIDES:${PN} += "lib7z.so()(64bit) 7z lib7z.so"
-RPROVIDES:${PN}-dev += "lib7z.so()(64bit) 7z lib7z.so"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-extended/p8platform/p8platform_git.bb b/meta-oe/recipes-extended/p8platform/p8platform_git.bb
index dc7280f099..e69d544b66 100644
--- a/meta-oe/recipes-extended/p8platform/p8platform_git.bb
+++ b/meta-oe/recipes-extended/p8platform/p8platform_git.bb
@@ -9,7 +9,6 @@ PV = "2.1.0.1+git"
 SRC_URI = "git://github.com/Pulse-Eight/platform.git;branch=master;protocol=https"
 SRCREV = "a7cd0d5780ed80a4e70480d1650749f29e8a1fb2"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
index 81d0746f89..ab5a8ef342 100644
--- a/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
+++ b/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb
@@ -15,7 +15,9 @@ SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https \
            file://0001-configure-Check-for-function-from-libdb-during-confi.patch \
            "
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
index d5137f80af..2886137b7d 100644
--- a/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
+++ b/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.1.bb
@@ -13,7 +13,6 @@ REQUIRED_DISTRO_FEATURES = "pam"
 SRCREV = "3e026863cad1fd45c760ee1bc93ef4f0606cc852"
 SRC_URI = "git://github.com/rmbreak/pam_ldapdb;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 do_install () {
     oe_runmake install DESTDIR=${D} PAMDIR=${base_libdir}/security
diff --git a/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb b/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
new file mode 100644
index 0000000000..0e2199b066
--- /dev/null
+++ b/meta-oe/recipes-extended/pam/pam-radius_3.0.0.bb
@@ -0,0 +1,29 @@
+SUMMARY = "PAM module for RADIUS authentication"
+DESCRIPTION = "This allows any PAM-capable machine to become a RADIUS client for \
+authentication and accounting requests. You will need a RADIUS server to perform \
+the actual authentication."
+HOMEPAGE = "http://freeradius.org/pam_radius_auth/"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
+
+SRC_URI = "git://github.com/FreeRADIUS/pam_radius.git;protocol=https;branch=master"
+SRCREV = "b6442c3e0147f1019990520483fa3a30e4ccf059"
+
+
+DEPENDS = "libpam"
+
+inherit autotools-brokensep features_check
+REQUIRED_DISTRO_FEATURES = "pam"
+
+EXTRA_OECONF = "--disable-developer"
+
+do_install() {
+    install -d ${D}${sysconfdir}
+    install -m 644 ${S}/pam_radius_auth.conf ${D}${sysconfdir}
+    install -d ${D}${base_libdir}/security
+    install -m 644 ${S}/pam_radius_auth.so ${D}${base_libdir}/security
+}
+
+FILES:${PN} += "${base_libdir}/security/*.so"
+FILES:${PN}-dbg += "${base_libdir}/security/.debug"
diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
index b5bcc63339..d14a20609a 100644
--- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
+++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://sourceforge.net/projects/pamsshagentauth/files/pam_ssh_agent_a
            file://0002-Check-against-the-correct-OPENSSL_VERSION_NUMBER.patch \
            file://0001-configure-Include-stdio.h-for-printf.patch \
            "
-SRC_URI[md5sum] = "8dbe90ab3625e545036333e6f51ccf1d"
 SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763"
 
 DEPENDS += "libpam openssl"
@@ -26,7 +25,7 @@ RDEPENDS:${PN} += "openssh-misc"
 
 # Kind of unfortunate to have underscores in the name.
 #
-S = "${WORKDIR}/pam_ssh_agent_auth-${PV}"
+S = "${UNPACKDIR}/pam_ssh_agent_auth-${PV}"
 
 inherit autotools-brokensep perlnative
 
@@ -53,3 +52,16 @@ do_compile () {
 #
 FILES:${PN} += "${base_libdir}/security/pam*"
 FILES:${PN}-dbg += "${base_libdir}/security/.debug"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766965/
+# ssh-rsa.c:59:24: error: passing argument 1 of 'EVP_DigestInit' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-rsa.c:60:26: error: passing argument 1 of 'EVP_DigestUpdate' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-rsa.c:61:25: error: passing argument 1 of 'EVP_DigestFinal' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:76:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:76:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:76:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:148:18: error: passing argument 1 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:148:23: error: passing argument 2 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+# ssh-ecdsa.c:148:27: error: passing argument 3 of 'DSA_SIG_get0' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/parallel/parallel_20250522.bb b/meta-oe/recipes-extended/parallel/parallel_20250522.bb
new file mode 100644
index 0000000000..79ea168675
--- /dev/null
+++ b/meta-oe/recipes-extended/parallel/parallel_20250522.bb
@@ -0,0 +1,39 @@
+SUMMARY = "GNU Parallel - A shell tool for executing jobs in parallel using one or more computers"
+DESCRIPTION = "GNU Parallel is a command-line tool for executing jobs in parallel on one or more computers. \
+It allows users to run multiple commands simultaneously, making it easier to process large batches of tasks."
+
+HOMEPAGE = "https://www.gnu.org/software/parallel/"
+LICENSE = "CC-BY-SA-4.0 & GFDL-1.3-or-later & GPL-3.0-or-later"
+
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \
+    file://LICENSES/GFDL-1.3-or-later.txt;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \
+    file://LICENSES/GPL-3.0-or-later.txt;md5=8da5784ab1c72e63ac74971f88658166 \
+"
+
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.bz2"
+SRC_URI[sha256sum] = "b4b28f475f8cff8bb6ed4b03cc5a67041f18fc73fa256923b23181b56afdb2cb"
+
+inherit autotools bash-completion
+
+PACKAGES += "${PN}-zsh-completion"
+FILES:${PN}-zsh-completion = "${datadir}/zsh"
+
+RDEPENDS:${PN} = " \
+    perl \
+    perl-module-file-basename \
+    perl-module-file-glob \
+    perl-module-file-path \
+    perl-module-file-temp \
+    perl-module-filehandle \
+    perl-module-getopt-long \
+    perl-module-io-select \
+    perl-module-ipc-open3 \
+    perl-module-posix \
+    perl-module-symbol \
+    perl-module-thread-queue \
+    perl-module-threads \
+    perl-module-threads-shared \
+"
+
+BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/pegtl/pegtl/run-ptest b/meta-oe/recipes-extended/pegtl/pegtl/run-ptest
new file mode 100644
index 0000000000..e819628c9f
--- /dev/null
+++ b/meta-oe/recipes-extended/pegtl/pegtl/run-ptest
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+fail_count=0
+all_count=0
+
+for test_suite in src/test/pegtl/pegtl-test-*
+do
+    if "./$test_suite"
+    then
+        echo "PASS: $test_suite"
+    else
+        echo "FAIL: $test_suite"
+        fail_count=$((fail_count + 1))
+    fi
+    all_count=$((all_count + 1))
+done
+
+if [ $fail_count -eq 0 ]
+then
+    echo "PASS: All $all_count tests passed"
+else
+    echo "FAIL: $fail_count of $all_count tests failed"
+fi
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb
deleted file mode 100644
index 237828dbfc..0000000000
--- a/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar"
-HOMEPAGE="https://github.com/taocpp/PEGTL"
-LICENSE="MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293"
-
-SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x"
-SRCREV = "cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe"
-
-inherit cmake
-
-S = "${WORKDIR}/git"
-
-CXXFLAGS += " -Wno-error=type-limits"
diff --git a/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
new file mode 100644
index 0000000000..4d540d0180
--- /dev/null
+++ b/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "header-only library for creating parsers according to Parsing Expression Grammar"
+HOMEPAGE = "https://github.com/taocpp/PEGTL"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293"
+
+SRC_URI = " \
+        git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x \
+        file://run-ptest \
+"
+
+SRCREV = "be527327653e94b02e711f7eff59285ad13e1db0"
+
+inherit cmake ptest
+
+
+do_install_ptest () {
+    install -d ${D}${PTEST_PATH}/src/test/pegtl/data
+    install -m 0755 ${B}/src/test/pegtl/pegtl-test-* ${D}${PTEST_PATH}/src/test/pegtl
+    install ${S}/src/test/pegtl/file_*.txt ${D}${PTEST_PATH}/src/test/pegtl
+    install ${S}/src/test/pegtl/data/*.json ${D}${PTEST_PATH}/src/test/pegtl/data
+}
+
+CXXFLAGS += " -Wno-error=type-limits"
diff --git a/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb b/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
index 7768d17418..367aedd4c5 100644
--- a/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
+++ b/meta-oe/recipes-extended/perl/libfile-fnmatch-perl_0.02.bb
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=34;endline=37;md5=54fdfac62963b7cece
 
 SRC_URI = "https://cpan.metacpan.org/authors/id/M/MJ/MJP/File-FnMatch-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "22f77c20d0fb5af01a3165e2df2fe34c"
 SRC_URI[sha256sum] = "962454b8e86bea8b132bf8af35757d0c6a8f5d599015bd6a5d68cb7ae7a9e916"
 
-S = "${WORKDIR}/File-FnMatch-${PV}"
+S = "${UNPACKDIR}/File-FnMatch-${PV}"
 
 inherit cpan
 
diff --git a/meta-oe/recipes-extended/plocate/plocate_1.1.22.bb b/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb
index 694c29776a..c9502db16a 100644
--- a/meta-oe/recipes-extended/plocate/plocate_1.1.22.bb
+++ b/meta-oe/recipes-extended/plocate/plocate_1.1.23.bb
@@ -12,4 +12,4 @@ DEPENDS = "zstd liburing"
 SRC_URI = "https://plocate.sesse.net/download/${BP}.tar.gz \
            file://0001-Include-linux-stat.h-only-when-sys-stat.h-is-not-inc.patch"
 
-SRC_URI[sha256sum] = "3b7e4741b4aa2ec044e53eff06474a32a3fb1e928b9382351fe79d4c27fb0049"
+SRC_URI[sha256sum] = "06bd3b284d5d077b441bef74edb0cc6f8e3f0a6f58b4c15ef865d3c460733783"
diff --git a/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb b/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
index aeda236901..5aba331acc 100644
--- a/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb
+++ b/meta-oe/recipes-extended/pmdk/pmdk_2.1.1.bb
@@ -3,18 +3,17 @@ DESCRIPTION = "Persistent Memory Development Kit"
 HOMEPAGE = "http://pmem.io"
 SECTION = "libs"
 LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b44ee63f162f9cdb18fff1224877aafd"
-DEPENDS = "ndctl cmake-native"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3e2f50552a27ca99772f3d884f98560b"
+DEPENDS = "ndctl"
 
 # Required to have the fts.h header for musl
 DEPENDS:append:libc-musl = " fts"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https"
-SRCREV = "ba92d6b469d52d16f26279bebaf317bbdbb3822c"
+SRCREV = "0f0ab391d8e3db52f745f33c92b9d9a462bb3695"
 
-inherit autotools-brokensep pkgconfig
+inherit pkgconfig
 
 # Fix jemalloc error:
 # | configure: error: cannot run C compiled programs.
@@ -26,7 +25,7 @@ EXTRA_OEMAKE = "BUILD_EXAMPLES='n' DOC='n' HOST_SYS='${HOST_SYS}' EXTRA_CFLAGS='
 # Fix the missing fts libs when using musl
 EXTRA_OEMAKE:append:libc-musl = " EXTRA_LIBS='-lfts'"
 
-do_configure:prepend() {
+do_configure() {
         touch .skip-doc
 }
 
@@ -45,4 +44,4 @@ FILES:${PN} += "${includedir}/libpmemobj++/* ${includedir}/libpmemobj/* /usr/*/i
 FILES:${PN} += "/usr/etc"
 FILES:${PN} += "/usr/share"
 
-COMPATIBLE_HOST='(x86_64).*'
+COMPATIBLE_HOST = '(x86_64).*'
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
index 8a14018a82..c0066d5636 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb
@@ -7,7 +7,7 @@ require polkit-group-rule.inc
 SRC_URI = "file://50-org.freedesktop.timedate1.rules"
 
 do_install() {
-        install -m 0755 ${WORKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d
+        install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${datadir}/polkit-1/rules.d
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
index 8266fa6396..ec8ff868d4 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb
@@ -7,7 +7,7 @@ require polkit-group-rule.inc
 SRC_URI = "file://50-org.freedesktop.NetworkManager.rules"
 
 do_install() {
-        install -m 0755 ${WORKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d
+        install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${datadir}/polkit-1/rules.d
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb
index db2ed015b4..884590d47c 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb
@@ -10,7 +10,7 @@ SRC_URI = "file://50-org.freedesktop.udiskie.rules"
 RDEPENDS:${PN} += "udisks2"
 
 do_install() {
-    install -m 0755 ${WORKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d
+    install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${datadir}/polkit-1/rules.d
 }
 
 USERADD_PACKAGES = "${PN}"
diff --git a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
index 4aeeb77d04..b1e16a924c 100644
--- a/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
+++ b/meta-oe/recipes-extended/polkit/polkit-group-rule.inc
@@ -7,7 +7,7 @@ REQUIRED_DISTRO_FEATURES = "polkit"
 inherit useradd
 
 do_install:prepend() {
-    install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d
-    chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
+        install -m 755 -d ${D}${datadir}/polkit-1/rules.d
 }
-USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;"
+
+FILES:${PN} += "${datadir}/polkit-1/rules.d"
diff --git a/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-oe/recipes-extended/polkit/polkit_126.bb
index 9e2eb05c62..0438c4e464 100644
--- a/meta-oe/recipes-extended/polkit/polkit_124.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_126.bb
@@ -1,38 +1,36 @@
-SUMMARY = "PolicyKit Authorization Framework"
+SUMMARY = "Polkit Authorization Framework"
 DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes."
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit"
 LICENSE = "LGPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb"
+BUGTRACKER = "https://github.com/polkit-org/polkit/issues"
 
-SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main"
 
-S = "${WORKDIR}/git"
-SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a"
+SRCREV = "d627b0d1e1108563658dabe3fb8d2a065e64df10"
 
-DEPENDS = "expat glib-2.0"
+DEPENDS = "expat glib-2.0 duktape"
 
 inherit meson pkgconfig useradd systemd gettext gobject-introspection features_check
 
 REQUIRED_DISTRO_FEATURES = "polkit"
 
+# Prevent meson.build to try to autodetect host OS (which could lead to
+# non-reproducibility)
+EXTRA_OEMESON = "-Dos_type=openembedded"
+
 PACKAGECONFIG = " \
         ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
         dbus \
-        mozjs \
 "
 PACKAGECONFIG[dbus] = ",,dbus"
 PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native"
 PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam"
-PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-Dsession_tracking=ConsoleKit,systemd"
-PACKAGECONFIG[consolekit] = ",,,consolekit"
-
-# Default to mozjs javascript library
-PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape"
-# duktape javascript engine is much smaller and faster but is not compatible with
-# same javascript standards as mozjs. For example array.includes() function is not
-# supported. Test rule compatibility when switching to duktape.
-PACKAGECONFIG[duktape] = "-Djs_engine=duktape,,duktape,,,mozjs"
+PACKAGECONFIG[systemd] = "-Dsession_tracking=logind,,systemd,,,consolekit elogind"
+PACKAGECONFIG[consolekit] = "-Dsession_tracking=ConsoleKit,,,consolekit,,systemd elogind"
+PACKAGECONFIG[elogind] = "-Dsession_tracking=libelogin,,elogind,,,systemd consolekit"
+PACKAGECONFIG[libs-only] = "-Dlibs-only=true,-Dlibs-only=false"
 
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 --shell /bin/nologin polkitd"
@@ -42,18 +40,26 @@ SYSTEMD_AUTO_ENABLE = "disable"
 
 do_install:append() {
         #Fix up permissions on polkit rules.d to work with rpm4 constraints
-        chmod 700 ${D}/${datadir}/polkit-1/rules.d
-        chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${datadir}/polkit-1/rules.d
-        chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
+        if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then
+                chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d
+                chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d
+        fi
+
+        # Polkit unconditionally installs a systemd service, remove it on SysVinit
+        # systems to avoid "installed but not packaged file" error.
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+                rm -rf ${D}${nonarch_libdir}/systemd ${D}${libdir}/systemd
+        fi
 }
 
 FILES:${PN} += " \
         ${libdir}/pam.d/polkit-1 \
         ${libdir}/sysusers.d \
+        ${libdir}/tmpfiles.d \
         ${libdir}/polkit-1 \
         ${nonarch_libdir}/pam.d/polkit-1 \
         ${nonarch_libdir}/sysusers.d \
+        ${nonarch_libdir}/tmpfiles.d \
         ${nonarch_libdir}/polkit-1 \
         ${datadir} \
 "
diff --git a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
index 25951c9de4..20b7f0a5bd 100644
--- a/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
+++ b/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb
@@ -11,7 +11,9 @@ PV = "0.0.1+git"
 SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77"
 SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 
 do_configure:prepend() {
     echo " " > ${S}/tests/CMakeLists.txt
diff --git a/meta-oe/recipes-extended/qad/qad_git.bb b/meta-oe/recipes-extended/qad/qad_git.bb
index 0bc94121a7..189d2f9d15 100644
--- a/meta-oe/recipes-extended/qad/qad_git.bb
+++ b/meta-oe/recipes-extended/qad/qad_git.bb
@@ -14,7 +14,9 @@ SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \
 
 SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362"
 
-S = "${WORKDIR}/git"
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 PV = "0.0+git"
 
 DEPENDS = "cjson libmicrohttpd libdrm libpng"
diff --git a/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
index f90e814f7a..00cae11c4e 100644
--- a/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb
+++ b/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=498c298542365dfcfe29948c72a5849b"
 
 SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master"
 
-SRCREV = "1eba85dbbe78fc1938f8aba2112ba1b228caed30"
+SRCREV = "4487f10e1bf258434fb8a39e4f59c29e31910ad0"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch b/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
new file mode 100644
index 0000000000..7003dd76c2
--- /dev/null
+++ b/meta-oe/recipes-extended/qhull/qhull/0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch
@@ -0,0 +1,35 @@
+From f72312ae0becb581cd428d17dbbcdf1b6f02ebee Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion@nwra.com>
+Date: Tue, 4 Oct 2022 21:56:58 -0600
+Subject: [PATCH] Use ${LIB_INSTALL_DIR} for cmake and pkgconfig files to
+ support multi-lib on Fedora/RedHat
+
+Upstream-Status: Backport [https://github.com/qhull/qhull/commit/67d231c872aa1bae892e5da9646a10b303477039]
+
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f50b187..c2248f9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -709,7 +709,7 @@ configure_file(${PROJECT_SOURCE_DIR}/build/config.cmake.in
+   @ONLY
+ )
+ 
+-set(ConfigPackageLocation lib/cmake/Qhull)
++set(ConfigPackageLocation ${LIB_INSTALL_DIR}/cmake/Qhull)
+ install(EXPORT QhullTargets
+   FILE
+     QhullTargets.cmake
+@@ -728,7 +728,7 @@ install(
+     Devel
+ )
+ 
+-set(PkgConfigLocation lib/pkgconfig)
++set(PkgConfigLocation ${LIB_INSTALL_DIR}/pkgconfig)
+ foreach(pkgconfig IN ITEMS "${qhull_SHAREDR};Qhull reentrant shared library"
+                            "${qhull_STATIC};Qhull static library"
+                            "${qhull_STATICR};Qhull reentrant static library"
diff --git a/meta-oe/recipes-extended/qhull/qhull_2020.2.bb b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
new file mode 100644
index 0000000000..13638c391b
--- /dev/null
+++ b/meta-oe/recipes-extended/qhull/qhull_2020.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "library to compute convex hulls, Delaunay triangulations and Voronoi diagrams."
+HOMEPAGE = "http://www.qhull.org/"
+SECTION = "libs"
+LICENSE = "Qhull"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=484ee0cacf0472e8b40225b116f6296c"
+
+SRC_URI = "http://www.qhull.org/download/qhull-2020-src-8.0.2.tgz \
+    file://0001-Use-LIB_INSTALL_DIR-for-cmake-and-pkgconfig-files-to.patch \
+"
+SRC_URI[sha256sum] = "b5c2d7eb833278881b952c8a52d20179eab87766b00b865000469a45c1838b7e"
+
+CFLAGS += "-fPIC"
+
+EXTRA_OECMAKE += "\
+    -DCMAKE_SKIP_RPATH=ON \
+    -DLIB_INSTALL_DIR=${baselib} \
+"
+
+inherit cmake
+
+# The QhullTargets-noconfig.cmake checks for the executables despite not
+# needing to execute them for the build.  Staging bindir to the sysroot
+# allows us to pass the check without building qhull natively
+SYSROOT_DIRS:append = " \
+    ${bindir} \
+"
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
index 7359c12544..c7f320660f 100644
--- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
+++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
@@ -10,7 +10,6 @@ network."
 SECTION = "System Environment/Daemons"
 
 SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.gz/be2a88f8ccddf2a40ac484cb3294fedc/${BP}.tar.gz"
-SRC_URI[md5sum] = "be2a88f8ccddf2a40ac484cb3294fedc"
 SRC_URI[sha256sum] = "4d6145d435a5d8b567b9798620f57f9b0a464078a1deba267958f168fbe776e6"
 
 SRC_URI += "file://0001-rarpd.8-add-man-file.patch \
@@ -25,7 +24,7 @@ SRC_URI += "file://0001-rarpd.8-add-man-file.patch \
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://rarpd.c;md5=199b20b172ea93121bc613a9c77b6931"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
@@ -36,10 +35,10 @@ do_install() {
     install -m 755 rarpd.init ${D}${sysconfdir}/init.d/rarpd
     install -m 755 rarpd ${D}${sbindir}/rarpd
     install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8
-    install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers
+    install -m 644 ${UNPACKDIR}/ethers.sample ${D}${sysconfdir}/ethers
 
     install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${UNPACKDIR}/rarpd.service ${D}${systemd_unitdir}/system/
 }
 
 inherit systemd
diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
index 3e757e6037..d643c6f0b9 100644
--- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
+++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https
            file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch"
 SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch
index 7785acca5c..63bf403412 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,4 +1,4 @@
-From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001
+From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
@@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
@@ -16,10 +18,7 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 
 Reworked for 6.0.4
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
 ---
-Upstream-Status: Pending
-
  deps/hiredis/Makefile | 2 --
  1 file changed, 2 deletions(-)
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index 20708eda1e..46330f5064 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From aa3d31355f3cc140b1dc2f4fcff8e3c0aa261549 Mon Sep 17 00:00:00 2001
+From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
 OE-specific parameters, instead of overriding all of these simply use
 the ones that are already passed in. Also configure for only Linux...
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Updated to work with 3.0.x
@@ -14,8 +16,6 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
 
 updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
-
-Upstream-Status: Pending
 ---
  deps/Makefile         |  1 -
  deps/lua/Makefile     |  1 -
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch
index 7b601e02a9..1f97f9783d 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001
+From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -9,14 +9,13 @@ removed in favor of magic.
 Note that this of course doesn't allow tcmalloc and jemalloc, however
 jemalloc wasn't building correctly.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-
 ---
-Upstream-Status: Pending
-
  src/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch
index 01e53e3f21..974cf5169f 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From d9d1f9a501ef7caa80d1e6595218898e9989ec2b Mon Sep 17 00:00:00 2001
+From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,8 +9,8 @@ environment to get it going
 e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
 
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
new file mode 100644
index 0000000000..8e5f30993b
--- /dev/null
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -0,0 +1,29 @@
+From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 21 Dec 2019 12:09:51 -0800
+Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
+
+Fixes
+| zmalloc.c:87:37: error: 'PTHREAD_MUTEX_DEFAULT' undeclared here (not in a function)
+|    87 | pthread_mutex_t used_memory_mutex = PTHREAD_MUTEX_INITIALIZER;
+|       |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/zmalloc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/zmalloc.c b/src/zmalloc.c
+index bbfa386..93e07ff 100644
+--- a/src/zmalloc.c
++++ b/src/zmalloc.c
+@@ -32,6 +32,7 @@
+ #include "config.h"
+ #include "solarisfixes.h"
+ 
++#define _GNU_SOURCE
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdint.h>
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch
index 93c3595261..7009048171 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,14 +1,14 @@
-From 634f62be6c135ece93cb4e44a69ce3cb66f394ca Mon Sep 17 00:00:00 2001
+From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Updated patch for 6.2.8
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
-
 ---
  src/debug.c | 26 ++++++++++++++++++++++++--
  1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server
index c5f335f57d..c5f335f57d 100755..100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf
index 75037d6dc8..75037d6dc8 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.service
index b7791d0df4..b7791d0df4 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.service
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
index d2a1b45e66..51a6e9c957 100644
--- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,11 +1,16 @@
-From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001
+From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
@@ -14,13 +19,11 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
 Reworked for 6.0.4
 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 ---
-Upstream-Status: Pending
-
  deps/hiredis/Makefile | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index 25ac154..569f82b 100644
+index 7e41c97..54717e3 100644
 --- a/deps/hiredis/Makefile
 +++ b/deps/hiredis/Makefile
 @@ -42,8 +42,6 @@ endef
@@ -32,6 +35,3 @@ index 25ac154..569f82b 100644
  OPTIMIZATION?=-O3
  WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
  DEBUG_FLAGS?= -g -ggdb
--- 
-2.21.3
-
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index aade7afd06..17b533669b 100644
--- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From 097a2b259cb266c2c861dc74fa6f80712d6138c5 Mon Sep 17 00:00:00 2001
+From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
 OE-specific parameters, instead of overriding all of these simply use
 the ones that are already passed in. Also configure for only Linux...
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Updated to work with 3.0.x
@@ -15,18 +17,16 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
 updated to work wtih 6.2.1
 Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
 ---
-Upstream-Status: Pending
-
  deps/Makefile         |  1 -
  deps/lua/Makefile     |  1 -
  deps/lua/src/Makefile | 16 ++++++----------
  3 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/deps/Makefile b/deps/Makefile
-index ff16ee9..d8d64aa 100644
+index cbe3aef..76bc222 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
-@@ -74,7 +74,6 @@ LUA_LDFLAGS+= $(LDFLAGS)
+@@ -81,7 +81,6 @@ endif
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
  # to fit redis into cross-compilation environments, which typically set AR.
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
index e76bdbc263..f1021eef6c 100644
--- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001
+From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -9,19 +9,18 @@ removed in favor of magic.
 Note that this of course doesn't allow tcmalloc and jemalloc, however
 jemalloc wasn't building correctly.
 
+Upstream-Status: Pending
+
 Signed-off-by: Venture Research <tech@ventureresearch.com>
 
 Update to work with 4.0.8
 Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-
 ---
-Upstream-Status: Pending
-
  src/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index ecd6929..c7f43c5 100644
+index 7d75c83..35dd314 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -13,7 +13,8 @@
diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
index 66ab0ee33c..958106e261 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001
+From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,17 +9,17 @@ environment to get it going
 e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
 
 Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile b/src/Makefile
-index 5564351..83ccd76 100644
+index 35dd314..3770f96 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -91,7 +91,7 @@ endif
+@@ -93,7 +93,7 @@ endif
  
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index 20f689bd0b..d73c66c9d0 100644
--- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
+++ b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
-From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001
+From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -9,6 +9,7 @@ Fixes
 |       |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  src/zmalloc.c | 1 +
@@ -26,6 +27,3 @@ index 1f33d09..5e182d1 100644
  #include <stdio.h>
  #include <stdlib.h>
  #include <stdint.h>
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
index 9d7e502717..bb3f5c607e 100644
--- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,9 +1,10 @@
-From 26bd72f3b8de22e5036d86e6c79f815853b83473 Mon Sep 17 00:00:00 2001
+From 6149911f7a6fbaef3ed418408e2b501fa9479ffa Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 
 Updated patch for 6.2.1
@@ -13,10 +14,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 24 insertions(+), 2 deletions(-)
 
 diff --git a/src/debug.c b/src/debug.c
-index 5318c14..8c21b47 100644
+index bb76c5d..55a0696 100644
 --- a/src/debug.c
 +++ b/src/debug.c
-@@ -1055,7 +1055,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
+@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
      #endif
  #elif defined(__linux__)
      /* Linux */
@@ -27,7 +28,7 @@ index 5318c14..8c21b47 100644
      GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
      #elif defined(__X86_64__) || defined(__x86_64__)
      GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
-@@ -1222,8 +1224,28 @@ void logRegisters(ucontext_t *uc) {
+@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) {
      #endif
  /* Linux */
  #elif defined(__linux__)
@@ -57,6 +58,3 @@ index 5318c14..8c21b47 100644
      serverLog(LL_WARNING,
      "\n"
      "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server
index c5f335f57d..c5f335f57d 100755..100644
--- a/meta-oe/recipes-extended/redis/redis/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.18.bb
index fa430ce402..171c6640f2 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.18.bb
@@ -10,19 +10,20 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://redis.conf \
            file://init-redis-server \
            file://redis.service \
-           file://hiredis-use-default-CC-if-it-is-set.patch \
-           file://lua-update-Makefile-to-use-environment-build-setting.patch \
-           file://oe-use-libc-malloc.patch \
-           file://0001-src-Do-not-reset-FINAL_LIBS.patch \
-           file://GNU_SOURCE.patch \
+           file://0001-hiredis-use-default-CC-if-it-is-set.patch \
+           file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://0003-hack-to-force-use-of-libc-malloc.patch \
+           file://0004-src-Do-not-reset-FINAL_LIBS.patch \
+           file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
-           "
-SRC_URI[sha256sum] = "34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277"
+          "
 
-inherit autotools-brokensep update-rc.d systemd useradd
+SRC_URI[sha256sum] = "470c75bac73d7390be4dd66479c6f29e86371c5d380ce0c7efb4ba2bbda3612d"
+
+inherit update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
 FINAL_LIBS:arm = "-latomic"
 FINAL_LIBS:powerpc = "-latomic"
@@ -36,21 +37,21 @@ GROUPADD_PARAM:${PN} = "--system redis"
 REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
 
 do_compile:prepend() {
-    (cd deps && oe_runmake hiredis lua linenoise)
+    oe_runmake -C deps hiredis lua linenoise
 }
 
 do_install() {
     export PREFIX=${D}/${prefix}
     oe_runmake install
     install -d ${D}/${sysconfdir}/redis
-    install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
+    install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
     install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
+    install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
     install -d ${D}/var/lib/redis/
     chown redis.redis ${D}/var/lib/redis/
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir}
     sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service
 
     if [ "${REDIS_ON_SYSTEMD}" = true ]; then
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.4.bb b/meta-oe/recipes-extended/redis/redis_7.2.8.bb
index 5d64e9ba78..3c4d84085b 100644
--- a/meta-oe/recipes-extended/redis/redis_7.2.4.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.2.8.bb
@@ -10,19 +10,22 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://redis.conf \
            file://init-redis-server \
            file://redis.service \
-           file://hiredis-use-default-CC-if-it-is-set.patch \
-           file://lua-update-Makefile-to-use-environment-build-setting.patch \
-           file://oe-use-libc-malloc.patch \
-           file://0001-src-Do-not-reset-FINAL_LIBS.patch \
-           file://GNU_SOURCE-7.patch \
+           file://0001-hiredis-use-default-CC-if-it-is-set.patch \
+           file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
+           file://0003-hack-to-force-use-of-libc-malloc.patch \
+           file://0004-src-Do-not-reset-FINAL_LIBS.patch \
+           file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
-           "
-SRC_URI[sha256sum] = "8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59"
+          "
 
-inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
+SRC_URI[sha256sum] = "6be4fdfcdb2e5ac91454438246d00842d2671f792673390e742dfcaf1bf01574"
+
+RPROVIDES:${PN} = "virtual-redis"
+
+inherit pkgconfig update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"
-FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32 = "-latomic"
 FINAL_LIBS:mips = "-latomic"
 FINAL_LIBS:arm = "-latomic"
 FINAL_LIBS:powerpc = "-latomic"
@@ -39,21 +42,21 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
 do_compile:prepend() {
-    (cd deps && oe_runmake hiredis lua linenoise)
+    oe_runmake -C deps hiredis lua linenoise
 }
 
 do_install() {
     export PREFIX=${D}/${prefix}
     oe_runmake install
     install -d ${D}/${sysconfdir}/redis
-    install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
+    install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
     install -d ${D}/${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
+    install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
     install -d ${D}/var/lib/redis/
     chown redis.redis ${D}/var/lib/redis/
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir}
     sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
@@ -68,3 +71,6 @@ INITSCRIPT_NAME = "redis-server"
 INITSCRIPT_PARAMS = "defaults 87"
 
 SYSTEMD_SERVICE:${PN} = "redis.service"
+
+CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
+CVE_STATUS[CVE-2022-0543] = "not-applicable-platform: Debian-specific CVE"
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
index cbe1af2854..69c281bd92 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.9.0.bb
@@ -6,14 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39df84cfd8a5e18bf988f277f7946676"
 
 DEPENDS = "libpng zlib glib-2.0 libxml2 groff-native python3-setuptools-native"
 
-SRCREV = "3af04acd38bbc61bbdcdd931dcf234c971aa5336"
-PV = "1.8.0"
+SRCREV = "522b228d74da7054594b6ed9c289058acd6cd3e7"
+PV = "1.9.0"
 
 SRC_URI = "\
     git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \
 "
 
-S = "${WORKDIR}/git"
 
 inherit cpan autotools-brokensep gettext pkgconfig python3native python3-dir systemd
 
@@ -22,6 +21,8 @@ BBCLASSEXTEND = "native"
 SYSTEMD_PACKAGES = "rrdcached"
 SYSTEMD_SERVICE:rrdcached = "rrdcached.socket rrdcached.service"
 
+AUTOTOOLS_AUXDIR = "${S}/conftools"
+
 EXTRA_AUTORECONF = "-I m4 --exclude=autopoint"
 
 PACKAGECONFIG ??= "perl graph ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -59,9 +60,13 @@ export STAGING_LIBDIR
 export STAGING_INCDIR
 
 # emulate cpan_do_configure
-EXTRA_OEMAKE = ' PERL5LIB="${PERL_ARCHLIB}" '
+EXTRA_OEMAKE = ' CC="${CC} -Wno-incompatible-pointer-types" PERL5LIB="${PERL_ARCHLIB}" '
 # Avoid do_configure error on some hosts
 
+do_configure:prepend () {
+        mkdir -p ${AUTOTOOLS_AUXDIR}
+}
+
 do_configure() {
     unset PERLHOSTLIB
     #fix the pkglib problem with newer automake
@@ -103,6 +108,11 @@ do_configure() {
         ${B}/examples/*.pl
 }
 
+do_install:append:class-native() {
+    # Replace the shebang line in cgi-demo.cgi
+    sed -i '1s|^.*$|#!/usr/bin/env rrdcgi|' ${D}${datadir}/rrdtool/examples/cgi-demo.cgi
+}
+
 PACKAGES =+ "${PN}-perl ${PN}-python"
 PACKAGES =+ "rrdcached"
 
@@ -129,3 +139,7 @@ RDEPENDS:${PN}-python = "python3"
 
 FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
     ${PYTHON_SITEPACKAGES_DIR}/.debug"
+
+# http://errors.yoctoproject.org/Errors/Details/766911/
+# rrd_tune.c:239:35: error: passing argument 3 of 'optparse_init' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb b/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
index f16126d936..f1235d7b96 100644
--- a/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/libfastjson_1.2304.0.bb
@@ -10,6 +10,7 @@ SRC_URI = "git://github.com/rsyslog/libfastjson.git;protocol=https;branch=master
 
 SRCREV = "3a8402c1de7c7747c95229db26d8d32fb85a7a52"
 
-S = "${WORKDIR}/git"
+
+CVE_PRODUCT = "rsyslog:libfastjson"
 
 inherit autotools
diff --git a/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch
new file mode 100644
index 0000000000..cf4f4080a6
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/librelp/0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch
@@ -0,0 +1,37 @@
+From baf992f82aa987c608731866876adb856847ea45 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 May 2024 18:03:40 -0700
+Subject: [PATCH] relp: fix build against upcoming `gcc-14`
+ (`-Werror=calloc-transposed-args`)
+
+`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
+   detected minor infelicity in `calloc()` API usage
+
+Fixes
+../../git/src/relp.c: In function 'addToEpollSet':
+../../git/src/relp.c:101:39: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
+  101 |         CHKmalloc(epd = calloc(sizeof(epolld_t), 1));
+      |                                       ^~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/rsyslog/librelp/pull/264]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/relp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/relp.c b/src/relp.c
+index eadda36..6268f1d 100644
+--- a/src/relp.c
++++ b/src/relp.c
+@@ -98,7 +98,7 @@ addToEpollSet(relpEngine_t *const pThis, epolld_type_t typ, void *ptr, int sock,
+        epolld_t *epd = NULL;
+        ENTER_RELPFUNC;
+ 
+-       CHKmalloc(epd = calloc(sizeof(epolld_t), 1));
++       CHKmalloc(epd = calloc(1, sizeof(epolld_t)));
+        epd->typ = typ;
+        epd->ptr = ptr;
+        epd->sock = sock;
+-- 
+2.45.0
+
diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
index 9d949c6303..3ccb87a9c5 100644
--- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb
@@ -11,12 +11,14 @@ SRC_URI = "git://github.com/rsyslog/librelp.git;protocol=https;branch=stable \
            file://0001-tests-Fix-callback-prototype.patch \
            file://0001-tcp-fix-some-compiler-warnings-with-enable-tls-opens.patch \
            file://0001-tests-Include-missing-sys-time.h.patch \
+           file://0001-relp-fix-build-against-upcoming-gcc-14-Werror-calloc.patch \
            file://run-ptest \
 "
 
 SRCREV = "b421f56d9ee31a966058d23bd23c966221c91396"
 
-S = "${WORKDIR}/git"
+
+CVE_PRODUCT = "rsyslog:librelp"
 
 inherit autotools pkgconfig ptest
 
@@ -58,14 +60,16 @@ do_install_ptest() {
     # some tests need to write to this directory
     chmod 777 -R ${D}${PTEST_PATH}/${TESTDIR}
 
-    # do NOT need to rebuild Makefile or $(check_PROGRAMS)
-    sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-
-    # fix the srcdir, top_srcdir, abs_top_builddir
-    sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+        sed -e '# do NOT need to rebuild Makefile or $(check_PROGRAMS)' \
+                -e 's/^Makefile:.*$/Makefile:/' \
+                -e 's/^check-TESTS:.*$/check-TESTS:/' \
+                -e '# fix the srcdir, top_srcdir, abs_top_builddir' \
+                -e 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \
+                -e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \
+                -e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \
+                -e '# fix the path to test-driver' \
+                -e '/^SH_LOG_DRIVER =/s/(top_srcdir)/(top_builddir)/' \
+                -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile
 
     # install test-driver
     install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
index c1480406fe..a506b7a6dc 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch
@@ -1,4 +1,4 @@
-From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001
+From 1b02236e84aaed5d80d4a67afb418eadb687d65f Mon Sep 17 00:00:00 2001
 From: Yi Fan Yu <yifan.yu@windriver.com>
 Date: Sat, 27 Mar 2021 19:18:25 -0400
 Subject: [PATCH] tests: disable the check for inotify
@@ -20,10 +20,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/tests/diag.sh b/tests/diag.sh
-index 6cd60ea88..7424f48c5 100755
+index a9c2a75..0b017c5 100755
 --- a/tests/diag.sh
 +++ b/tests/diag.sh
-@@ -2672,7 +2672,7 @@ case $1 in
+@@ -2979,7 +2979,7 @@ case $1 in
                 fi
                 ;;
         'check-inotify') # Check for inotify/fen support 
@@ -32,7 +32,7 @@ index 6cd60ea88..7424f48c5 100755
                         echo [inotify mode]
                 elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then
                         grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h
-@@ -2687,7 +2687,7 @@ case $1 in
+@@ -2994,7 +2994,7 @@ case $1 in
                 fi
                 ;;
         'check-inotify-only') # Check for ONLY inotify support 
@@ -41,6 +41,3 @@ index 6cd60ea88..7424f48c5 100755
                         echo [inotify mode]
                 else
                         echo [inotify not supported, skipping...]
--- 
-2.29.2
-
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
new file mode 100644
index 0000000000..884086bfc3
--- /dev/null
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch
@@ -0,0 +1,32 @@
+From 59753fe14e9eef4909a535b6e00967e546cc29ea Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 May 2024 23:31:46 -0700
+Subject: [PATCH] tests/tcpflood.c: Pass correct parameter type to sendto()
+
+Fixes build with GCC-14 and musl
+
+../../rsyslog-8.2404.0/tests/tcpflood.c:811:70: error: passing argument 5 of 'sendto' from incompatible pointer type [-Wincompatible-pointer-types]
+  811 |                         lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
+      |                                                                      ^~~~~~~~
+      |                                                                      |
+      |                                                                      struct sockaddr_in *
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tests/tcpflood.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/tcpflood.c b/tests/tcpflood.c
+index 5e6f13a..09cedbb 100644
+--- a/tests/tcpflood.c
++++ b/tests/tcpflood.c
+@@ -836,7 +836,7 @@ int sendMessages(struct instdata *inst)
+                        }
+                        lenSend = sendPlainTCP(socknum, buf, lenBuf, &error_number);
+                } else if(transport == TP_UDP) {
+-                       lenSend = sendto(udpsockout, buf, lenBuf, 0, &udpRcvr, sizeof(udpRcvr));
++                       lenSend = sendto(udpsockout, buf, lenBuf, 0, (const struct sockaddr *)&udpRcvr, sizeof(udpRcvr));
+                        error_number = errno;
+                } else if(transport == TP_TLS) {
+                        if(sockArray[socknum] == -1) {
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
index 0352587268..f5ae65fb58 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch
@@ -1,4 +1,4 @@
-From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001
+From d2dd13d930c91e45417c7361908f0af75e0e6c00 Mon Sep 17 00:00:00 2001
 From: Roy Li <rongqing.li@windriver.com>
 Date: Wed, 18 Jun 2014 13:46:52 +0800
 Subject: [PATCH] use pkgconfig to check libgcrypt
@@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide
 
 Signed-off-by: Roy Li <rongqing.li@windriver.com>
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-
 ---
  configure.ac | 15 +--------------
  1 file changed, 1 insertion(+), 14 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 62178c3..b56c9c7 100644
+index f8c0ac8..794bfb3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt,
+@@ -1217,20 +1217,7 @@ AC_ARG_ENABLE(libgcrypt,
          [enable_libgcrypt=yes]
  )
  if test "x$enable_libgcrypt" = "xyes"; then
@@ -40,4 +39,4 @@ index 62178c3..b56c9c7 100644
 +       PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
  fi
  AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes)
- AC_SUBST(LIBGCRYPT_CFLAGS)
+ AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2504.0.bb
index af46cc14d7..c4ddb72bcc 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2402.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2504.0.bb
@@ -25,25 +25,28 @@ SRC_URI = "https://www.rsyslog.com/files/download/rsyslog/${BPN}-${PV}.tar.gz \
            file://use-pkgconfig-to-check-libgcrypt.patch \
            file://run-ptest \
            file://0001-tests-disable-the-check-for-inotify.patch \
+           file://0001-tests-tcpflood.c-Pass-correct-parameter-type-to-send.patch \
 "
 
 SRC_URI:append:libc-musl = " \
     file://0001-Include-sys-time-h.patch \
     file://disable-omfile-outchannel.patch \
 "
+SRC_URI[sha256sum] = "5092a20ed40987c74cc604ebfcd6c749e47eb9fc34adc1c2637e6553e7f047ab"
 
-SRC_URI[sha256sum] = "acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba"
-
-UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases"
+UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
+CVE_PRODUCT = "rsyslog:rsyslog"
+
 inherit autotools pkgconfig systemd update-rc.d ptest
 
-EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
-EXTRA_OECONF += "--enable-imfile-tests"
-EXTRA_OECONF:remove:mipsarch = "ap_cv_atomic_builtins=yes"
-EXTRA_OECONF:remove:powerpc = "ap_cv_atomic_builtins=yes"
-EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes"
+EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}"
+ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes"
+ATOMICS:mipsarch = ""
+ATOMICS:powerpc = ""
+ATOMICS:riscv32 = ""
+ATOMICS:armv5 = ""
 
 # first line is default yes in configure
 PACKAGECONFIG ??= " \
@@ -99,16 +102,18 @@ do_install_ptest() {
     # some tests need to write to this directory as user 'daemon'
     chmod 777 -R ${D}${PTEST_PATH}/tests
 
-    # do NOT need to rebuild Makefile itself
-    sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    # do NOT need to rebuild $(check_PROGRAMS)
-    sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-
-    # fix the srcdir, top_srcdir
-    sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
-    # fix the abs_top_builddir
-    sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile
+        sed -e '# do NOT need to rebuild Makefile itself' \
+            -e 's/^Makefile:.*$/Makefile:/' \
+            -e '# do NOT need to rebuild $(check_PROGRAMS)' \
+            -e 's/^check-TESTS:.*$/check-TESTS:/' \
+            -e '# fix the srcdir, top_srcdir' \
+            -e 's,^\(srcdir = \).*,\1${PTEST_PATH}/tests,' \
+            -e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/tests,' \
+            -e '# fix the abs_top_builddir' \
+            -e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \
+            -e '# fix the path to test-driver' \
+            -e '/^\(SH_\)\?LOG_DRIVER/s/(top_srcdir)/(top_builddir)/' \
+            -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile
 
     # install test-driver
     install -m 644 ${S}/test-driver ${D}${PTEST_PATH}
@@ -137,9 +142,9 @@ do_install_ptest() {
 do_install:append() {
     install -d "${D}${sysconfdir}/init.d"
     install -d "${D}${sysconfdir}/logrotate.d"
-    install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog
-    install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
-    install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
+    install -m 755 ${UNPACKDIR}/initscript ${D}${sysconfdir}/init.d/syslog
+    install -m 644 ${UNPACKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
+    install -m 644 ${UNPACKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
     sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
 
     if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then
@@ -152,7 +157,7 @@ do_install:append() {
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${systemd_system_unitdir}
-        install -m 644 ${WORKDIR}/rsyslog.service ${D}${systemd_system_unitdir}
+        install -m 644 ${UNPACKDIR}/rsyslog.service ${D}${systemd_system_unitdir}
         sed -i -e "s,@sbindir@,${sbindir},g" ${D}${systemd_system_unitdir}/rsyslog.service
     fi
 }
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch b/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch
deleted file mode 100644
index 41f98281f8..0000000000
--- a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9db4c0f6bc0dd11c77b54296fce6b8afe18f4325 Mon Sep 17 00:00:00 2001
-From: Steffen Nurpmeso <steffen@sdaoden.eu> 
-Date: Thu, 9 Jun 2022 18:26:38 +0800
-Subject: [PATCH] su_INLINE: eh no; give up, share detection with clang but for
- a thing
-
-Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- include/su/code.h | 34 +++++++++-------------------------
- 1 file changed, 9 insertions(+), 25 deletions(-)
-
-diff --git a/include/su/code.h b/include/su/code.h
-index 9683f4a..c7a2af3 100644
---- a/include/su/code.h
-+++ b/include/su/code.h
-@@ -308,29 +308,8 @@ do{\
- # ifdef DOXYGEN
- #  define su_INLINE inline
- #  define su_SINLINE inline
--# elif su_CC_GCC
--#  if !su_CC_VCHECK_GCC(3, 1)
--#   define su_INLINE extern __inline__
--#   define su_SINLINE static __inline__
--#  elif !defined __GNUC_GNU_INLINE__  /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/
--#   define su_INLINE extern __inline __attribute__((always_inline))
--#   define su_SINLINE static __inline __attribute__((always_inline))
--   /* gcc 8.3.0 bug: does not gracefully inline with -Os
--    * gcc 12.1.0 bug: ditto, -Og
--    * Thus: always gcc-specific! */
--#  elif 1 /*!defined __OPTIMIZE__ || \
--      !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/
--#   define su_INLINE extern __inline __attribute__((gnu_inline))
--#   define su_SINLINE static __inline __attribute__((gnu_inline))
--#  elif !defined NDEBUG || !defined __OPTIMIZE__
--#   define su_INLINE static inline
--#   define su_SINLINE static inline
--#  else
--#   define su_INLINE inline
--#   define su_SINLINE static inline
--#  endif
--# elif su_CC_CLANG || su_CC_PCC
--#  if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901L
-+# elif su_CC_CLANG || su_CC_GCC || su_CC_PCC
-+#  if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901l
- #   if !defined NDEBUG || !defined __OPTIMIZE__
- #    define su_INLINE static inline
- #    define su_SINLINE static inline
-@@ -340,8 +319,13 @@ do{\
- #    define su_SINLINE static inline __attribute__((always_inline))
- #   endif
- #  else
--#   define su_INLINE static __inline
--#   define su_SINLINE static __inline
-+#   if su_CC_VCHECK_GCC(3, 1)
-+#    define su_INLINE static __inline __attribute__((always_inline))
-+#    define su_SINLINE static __inline __attribute__((always_inline))
-+#   else
-+#    define su_INLINE static __inline
-+#    define su_SINLINE static __inline
-+#   endif
- #  endif
- # else
- #  define su_INLINE static /* TODO __attribute__((unused)) alike? */
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch b/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch
deleted file mode 100644
index 37ecb0c1ff..0000000000
--- a/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5429b9e343c808951b1418d8626e544c9dcb28de Mon Sep 17 00:00:00 2001
-From: Steffen Nurpmeso <steffen@sdaoden.eu>
-Date: Thu, 9 Jun 2022 18:06:04 +0800
-Subject: [PATCH] su_INLINE: gcc: only GNU specifics after -Og
-
-Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- include/su/code.h | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/include/su/code.h b/include/su/code.h
-index 4d552c1..9683f4a 100644
---- a/include/su/code.h
-+++ b/include/su/code.h
-@@ -309,16 +309,17 @@ do{\
- #  define su_INLINE inline
- #  define su_SINLINE inline
- # elif su_CC_GCC
--   /* After lots of trouble with OpenBSD/gcc 4.2.1 and SunOS/gcc 3.4.3 */
--#  if !su_CC_VCHECK_GCC(3, 2) /* Unsure: only used C++ at that time */
--#   define su_INLINE extern __inline
--#   define su_SINLINE static __inline
--#  elif !su_CC_VCHECK_GCC(4, 3)
-+#  if !su_CC_VCHECK_GCC(3, 1)
-+#   define su_INLINE extern __inline__
-+#   define su_SINLINE static __inline__
-+#  elif !defined __GNUC_GNU_INLINE__  /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/
- #   define su_INLINE extern __inline __attribute__((always_inline))
- #   define su_SINLINE static __inline __attribute__((always_inline))
--   /* xxx gcc 8.3.0 bug: does not truly inline with -Os */
--#  elif !su_CC_VCHECK_GCC(8, 3) || !defined __OPTIMIZE__ ||\
--      !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L
-+   /* gcc 8.3.0 bug: does not gracefully inline with -Os
-+    * gcc 12.1.0 bug: ditto, -Og
-+    * Thus: always gcc-specific! */
-+#  elif 1 /*!defined __OPTIMIZE__ || \
-+      !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/
- #   define su_INLINE extern __inline __attribute__((gnu_inline))
- #   define su_SINLINE static __inline __attribute__((gnu_inline))
- #  elif !defined NDEBUG || !defined __OPTIMIZE__
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb
index bcdb1e4788..93a852a6df 100644
--- a/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb
+++ b/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb
@@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023"
 SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \
            file://make-errors.patch \
            file://0001-make.rc-set-VAL_MTA.patch \
-           file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \
-           file://0001-su_INLINE-eh-no-give-up-share-detection.patch \
            file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \
 "
-SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c"
+SRC_URI[sha256sum] = "20ff055be9829b69d46ebc400dfe516a40d287d7ce810c74355d6bdc1a28d8a9"
 
 DEPENDS = "coreutils-native"
 
diff --git a/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb b/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
index d369af1c6a..fe8592be39 100644
--- a/meta-oe/recipes-extended/sanlock/sanlock_3.9.2.bb
+++ b/meta-oe/recipes-extended/sanlock/sanlock_4.0.0.bb
@@ -17,9 +17,8 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \
            file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \
            file://0001-add-missing-system-header-string.h.patch \
            "
-SRCREV = "e005fbec2324aa8de7e2f302e5a17483c525b1d1"
+SRCREV = "70c268a07273da78a4aadd14c40ffb75138ccebe"
 
-S = "${WORKDIR}/git"
 
 CVE_STATUS[CVE-2012-5638] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 
diff --git a/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb b/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
index 0e5fc7b6bb..41cbe4c429 100644
--- a/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
+++ b/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb
@@ -10,9 +10,11 @@ SECTION = "Development/Libraries"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/sblim/${BP}.tar.bz2 \
            file://sblim-cmpi-devel-2.0.3-docdir.patch"
-SRC_URI[md5sum] = "b934616f88a848f17ca3cf1b9e792cbf"
 SRC_URI[sha256sum] = "1671cabff6b922b6fde897673d9fdafd56c9310f82a7eacc0547d596b9cdfea6"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/development%20pkgs/sblim-cmpi-devel/"
+UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
+
 inherit autotools
 
 BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
index 4e90215c0e..03d8d4940c 100644
--- a/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
+++ b/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb
@@ -9,11 +9,12 @@ SECTION = "Development/Libraries"
 
 DEPENDS = "cmpi-bindings"
 
-S = "${WORKDIR}/sblim-sfcCommon-${PV}"
+S = "${UNPACKDIR}/sblim-sfcCommon-${PV}"
 SRC_URI = "http://downloads.sourceforge.net/sblim/sblim-sfcCommon-${PV}.tar.bz2"
-SRC_URI[md5sum] = "8aa2655d97bdea54c4750f220b40990c"
 SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/sblim-sfcCommon/"
+
 inherit autotools
 
 do_install() {
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch
index c16e393f49..f9083e7934 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb/0001-include-missing-system-headers.patch
@@ -18,8 +18,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  trace.h             | 3 ++-
  9 files changed, 12 insertions(+), 3 deletions(-)
 
-diff --git a/brokerEnc.c b/brokerEnc.c
-index 9115e71..889afcd 100644
 --- a/brokerEnc.c
 +++ b/brokerEnc.c
 @@ -25,6 +25,8 @@
@@ -31,8 +29,6 @@ index 9115e71..889afcd 100644
  extern const char *opGetClassNameChars(const CMPIObjectPath * cop);
  extern const char *opGetNameSpaceChars(const CMPIObjectPath * cop);
  extern CMPIConstClass *getConstClass(const char *ns, const char *cn);
-diff --git a/brokerOs.c b/brokerOs.c
-index 8d73a0b..b1427fd 100644
 --- a/brokerOs.c
 +++ b/brokerOs.c
 @@ -22,6 +22,7 @@
@@ -43,8 +39,6 @@ index 8d73a0b..b1427fd 100644
  
  static char    *
  resolveFileName(const char *filename)
-diff --git a/mlog.c b/mlog.c
-index a2d9eb7..6d9cd29 100644
 --- a/mlog.c
 +++ b/mlog.c
 @@ -26,6 +26,7 @@ const char     *_mlog_id =
@@ -55,8 +49,6 @@ index a2d9eb7..6d9cd29 100644
  #include <errno.h>
  #include <signal.h>
  #include "trace.h"              /* for setSignal() */
-diff --git a/mofc/backend_sfcb.c b/mofc/backend_sfcb.c
-index 614abcd..99d4061 100644
 --- a/mofc/backend_sfcb.c
 +++ b/mofc/backend_sfcb.c
 @@ -29,7 +29,7 @@
@@ -68,8 +60,6 @@ index 614abcd..99d4061 100644
  
  extern CMPIStatus sfcb_simpleArrayAdd(CMPIArray * array, CMPIValue * val, CMPIType type);
  extern CMPIObjectPath *getObjectPath(char *path, char **msg);
-diff --git a/sfcbdump.c b/sfcbdump.c
-index 8a9c335..aa8559c 100644
 --- a/sfcbdump.c
 +++ b/sfcbdump.c
 @@ -23,6 +23,7 @@
@@ -80,8 +70,6 @@ index 8a9c335..aa8559c 100644
  #include "objectImpl.h"
  
  #define BINARY_NAME argv[0]
-diff --git a/sfcbdumpP32onI32.c b/sfcbdumpP32onI32.c
-index ccf87dc..3540751 100644
 --- a/sfcbdumpP32onI32.c
 +++ b/sfcbdumpP32onI32.c
 @@ -22,6 +22,7 @@
@@ -92,8 +80,6 @@ index ccf87dc..3540751 100644
  #include <getopt.h>
  #include "objectImpl.h"
  #include <byteswap.h>
-diff --git a/sfcbsem.c b/sfcbsem.c
-index 3f8de7f..1e6358b 100644
 --- a/sfcbsem.c
 +++ b/sfcbsem.c
 @@ -21,6 +21,7 @@
@@ -104,8 +90,6 @@ index 3f8de7f..1e6358b 100644
  #include <getopt.h>
  #include <errno.h>
  
-diff --git a/trace.c b/trace.c
-index 23597e1..c4f8011 100644
 --- a/trace.c
 +++ b/trace.c
 @@ -25,6 +25,7 @@
@@ -125,8 +109,6 @@ index 23597e1..c4f8011 100644
  int             terminating = 0;
  int             colorTrace;
  
-diff --git a/trace.h b/trace.h
-index ea39850..52d408d 100644
 --- a/trace.h
 +++ b/trace.h
 @@ -25,6 +25,7 @@
@@ -137,7 +119,7 @@ index ea39850..52d408d 100644
  extern unsigned long _sfcb_trace_mask;
  /* use pointer indirect _sfcb_trace_mask to allow shared memory flag */
  extern unsigned long *_ptr_sfcb_trace_mask;
-@@ -162,7 +163,7 @@ extern sigHandler *setSignal(int sn, sigHandler * sh, int flags);
+@@ -162,7 +163,7 @@ extern sigHandler *setSignal(int sn, sig
  
  extern char    *processName;
  extern int      providerProcess;
@@ -146,6 +128,33 @@ index ea39850..52d408d 100644
  extern int      terminating;
  
  #endif
--- 
-2.37.3
-
+--- a/support.c
++++ b/support.c
+@@ -39,6 +39,7 @@
+ #include <err.h>
+ #endif
+ #include <errno.h>
++#include <string.h> /* memcpy */
+ #include "native.h"
+ #include "trace.h"
+ #include "control.h"
+--- a/qualifier.c
++++ b/qualifier.c
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <string.h> /* memcpy */
+ #include "objectImpl.h"
+ #include "qualifier.h"
+ 
+--- a/objectImplSwapI32toP32.c
++++ b/objectImplSwapI32toP32.c
+@@ -24,6 +24,7 @@
+ #include <byteswap.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h> /* memcpy */
+ #include <sfcCommon/utilft.h>
+ #include <sys/utsname.h>
+ 
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
index 2a7cf2285e..591321b7e9 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
@@ -31,7 +31,6 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \
            file://0001-include-missing-system-headers.patch \
 "
 
-SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30"
 SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd"
 
 CVE_STATUS[CVE-2012-3381] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
@@ -43,9 +42,10 @@ SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "sblim-sfcb.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
-LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -Wl,--allow-shlib-undefined ', '', d)}"
 
+CFLAGS += "-std=gnu17"
+
 EXTRA_OECONF = '--enable-debug \
                 --enable-ssl \
                 --enable-pam \
@@ -64,7 +64,7 @@ do_install() {
     oe_runmake DESTDIR=${D} install
 
     install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service
+    install -m 0644 ${UNPACKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service
 
     install -d ${D}${sysconfdir}/init.d
     mv ${D}${sysconfdir}/init.d/sfcb ${D}${sysconfdir}/init.d/sblim-sfcb
@@ -86,3 +86,8 @@ FILES:${PN} += "${libdir}/sfcb ${datadir}/sfcb"
 FILES:${PN}-dbg += "${libdir}/sfcb/.debug"
 
 RDEPENDS:${PN} = "perl bash"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766970/
+# sblim-sfcb-1.4.9/trace.c:214:18: error: passing argument 1 of 'gmtime_r' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
new file mode 100644
index 0000000000..5e8f4fa0d5
--- /dev/null
+++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
@@ -0,0 +1,72 @@
+From 5151163d6f4d4de0699d1e85c54fbe2cb5b55460 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Thu, 27 Jun 2024 01:51:36 +0000
+Subject: Fix incompatible pointer type error with gcc option 
+ -Wincompatible-pointer-types
+
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c: In function 'main':
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types]
+|    86 |           showClass(data.value.cls);
+|       |                     ~~~~~~~~~~^~~~
+|       |                               |
+|       |                               CIMCClass * {aka struct _CIMCClass *}
+| In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:7:
+| ../../sblim-sfcc-2.2.8/TEST/show.h:9:34: note: expected 'CMPIConstClass *' {aka 'struct _CMPIConstClass *'} but argument is of type 'CIMCClass *' {aka 'struct _CIMCClass *'}
+|     9 | void showClass( CMPIConstClass * in_class );
+|       |                 ~~~~~~~~~~~~~~~~~^~~~~~~~
+
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c: In function 'main':
+| ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types]
+|    96 |           showObjectPath(data.value.ref);
+|       |                          ~~~~~~~~~~^~~~
+|       |                                    |
+|       |                                    CIMCObjectPath * {aka struct _CIMCObjectPath *}
+| In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:7:
+| ../../sblim-sfcc-2.2.8/TEST/show.h:7:39: note: expected 'CMPIObjectPath *' {aka 'struct _CMPIObjectPath *'} but argument is of type 'CIMCObjectPath *' {aka 'struct _CIMCObjectPath *'}
+|     7 | void showObjectPath( CMPIObjectPath * objectpath );
+|       |                      ~~~~~~~~~~~~~~~~~^~~~~~~~~~
+| make[2]: *** [Makefile:1110: v2test_ein.o] Error 1
+| make[2]: *** Waiting for unfinished jobs....
+| ../../sblim-sfcc-2.2.8/TEST/v2test_im.c: In function 'main':
+| ../../sblim-sfcc-2.2.8/TEST/v2test_im.c:82:40: warning: '%s' directive argument is null [-Wformat-overflow=]
+|    82 |     printf( "invokeMethod() rc=%d, msg=%s\n",
+|       |                                        ^~
+
+Upstream-Status: Backport
+[https://github.com/kkaempf/sblim-sfcc/commit/881fccbaf19e26cbef3da1bebe2b42b3a9de1147#diff-ad9eeee99837ead0f29c70cd5f3956178dc3d51bd79618affd53d72a31404d5f]
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ TEST/v2test_ec.c  | 2 +-
+ TEST/v2test_ein.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c
+index 940ca57..72a93a5 100644
+--- a/TEST/v2test_ec.c
++++ b/TEST/v2test_ec.c
+@@ -83,7 +83,7 @@ int main()
+        count = enm->ft->hasNext(enm, NULL) ;
+        while (count > 0) {
+           data = enm->ft->getNext(enm, NULL);
+-          showClass(data.value.cls);          
++          showClass((CMPIConstClass *)data.value.cls);          
+           /*
+            * see if we have any more
+            */
+diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c
+index ede95c1..c9d1152 100644
+--- a/TEST/v2test_ein.c
++++ b/TEST/v2test_ein.c
+@@ -93,7 +93,7 @@ int count = 0;
+                  
+           data = enm->ft->getNext(enm, NULL);
+ 
+-          showObjectPath(data.value.ref);
++          showObjectPath((CMPIObjectPath *)data.value.ref);
+           /*
+            * see if we have any more
+            */
+-- 
+2.34.1
+
diff --git a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
index c9d3ddd6b2..733cddc88b 100644
--- a/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
+++ b/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb
@@ -5,14 +5,21 @@ HOMEPAGE = "http://www.sblim.org"
 SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \
            file://0001-Fix-implicit-function-declarations.patch \
+           file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \
            "
 
-SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae"
 SRC_URI[sha256sum] = "1b8f187583bc6c6b0a63aae0165ca37892a2a3bd4bb0682cd76b56268b42c3d6"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/sblim-sfcc/"
+
 LICENSE = "EPL-1.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261"
 
 DEPENDS = "curl"
 
 inherit autotools
+
+# http://errors.yoctoproject.org/Errors/Details/766897/
+# sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types]
+# sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
index 4fefd5169b..ccd2f90c3b 100644
--- a/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
+++ b/meta-oe/recipes-extended/scsirastools/scsirastools_1.6.6.bb
@@ -14,7 +14,6 @@ SRC_URI = "http://prdownloads.sourceforge.net/scsirastools/scsirastools-${PV}.ta
            file://mdadm.patch;apply=no \
            file://print-format.patch \
 "
-SRC_URI[md5sum] = "6271a61b2ce40aaf33ef61775148cda1"
 SRC_URI[sha256sum] = "e7b997e75decb06a650c42c35cd63d0c94c34e39cf133c723337b0eeabbfdf6a"
 
 inherit autotools update-rc.d
@@ -24,7 +23,7 @@ EXTRA_OEMAKE += "CC='${CC}' CFLAGS='${CFLAGS} -D_LARGEFILE64_SOURCE=1' sbindir=$
 
 do_configure:append() {
         oe_runmake -C mdadm.d mdadm-1.3.0
-        patch -p0 < ${WORKDIR}/mdadm.patch
+        patch -p0 < ${UNPACKDIR}/mdadm.patch
 }
 INITSCRIPT_PACKAGES = "${PN}-diskmon ${PN}-raidmon"
 INITSCRIPT_NAME:${PN}-diskmon = "sgdisk"
@@ -44,3 +43,18 @@ FILES:${PN}-raidmon = "${sbindir}/sgraidmon ${sysconfdir}/init.d/sgraid"
 RDEPENDS:${PN} += "bash"
 RDEPENDS:${PN}-diskmon += "${PN} bash"
 RDEPENDS:${PN}-raidmon += "${PN} bash"
+
+# This one is reproducible only on 32bit MACHINEs
+# http://errors.yoctoproject.org/Errors/Details/766967/
+# scsirastools-1.6.6/src/sgdiag.c:238:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiag.c:697:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiag.c:699:30: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiag.c:733:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdefects.c:214:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgmode.c:290:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdiskmon.c:1278:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdskfl.c:318:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgdskfl.c:829:37: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgraidmon.c:1641:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+# scsirastools-1.6.6/src/sgsafte.c:1298:23: error: passing argument 1 of 'ctime' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch b/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch
deleted file mode 100644
index 8afcb1fa48..0000000000
--- a/meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 927cd88cad7bea94c2eebecc18f7881f0defaccb Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 26 Jan 2023 23:36:29 -0800
-Subject: [PATCH] include missing <cstdint>
-
-gcc 13 moved some includes around and as a result <cstdint>
-is no longer transitively included [1]. Explicitly include
-it for uint{32,64}_t.
-
-[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/425]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Common/DtaOptions.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Common/DtaOptions.h b/Common/DtaOptions.h
-index c012af1..7530a0b 100644
---- a/Common/DtaOptions.h
-+++ b/Common/DtaOptions.h
-@@ -21,6 +21,7 @@ along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
- #ifndef _DTAOPTIONS_H
- #define        _DTAOPTIONS_H
- 
-+#include <cstdint>
- /** Output modes */
- typedef enum _sedutiloutput {
-        sedutilNormal,
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-extended/sedutil/sedutil_git.bb b/meta-oe/recipes-extended/sedutil/sedutil_git.bb
index 972a33c742..e8987b2dd0 100644
--- a/meta-oe/recipes-extended/sedutil/sedutil_git.bb
+++ b/meta-oe/recipes-extended/sedutil/sedutil_git.bb
@@ -7,13 +7,12 @@ LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
 
-PV = "1.20.0"
-SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a"
+PV = "1.20.0+git"
+
+SRCREV = "6270fb0e3c110572d96936a473b5e0d21a39884d"
 SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \
            file://0001-Fix-build-on-big-endian-architectures.patch \
-           file://0001-include-missing-cstdint.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep
diff --git a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
index 9b25745ed6..1b3a484ccb 100644
--- a/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
+++ b/meta-oe/recipes-extended/sgpio/sgpio_1.2.0.10.bb
@@ -6,10 +6,9 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-1.2-0.10-src.ta
            file://Makefile-error-fix.patch \
            file://0001-makefile-Add-LDFLAGS-to-linking-rule.patch \
            "
-SRC_URI[md5sum] = "a417bf68da4e9bd79a4664c11d7debd1"
 SRC_URI[sha256sum] = "9bf8c42acaa247efd9321bdb1fc2390022f0c554d77fbbd4a7363d990fc0270b"
 
-S = "${WORKDIR}/${BPN}"
+S = "${UNPACKDIR}/${BPN}"
 
 LICENSE = "GPL-2.0-or-later"
 LIC_FILES_CHKSUM = "file://LICENSE_GPL;md5=393a5ca445f6965873eca0259a17f833"
diff --git a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb
index 1e5ffdd856..1e63179e84 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb
+++ b/meta-oe/recipes-extended/sigrok/libsigrok_0.5.2.bb
@@ -19,7 +19,6 @@ inherit autotools pkgconfig mime
 
 SRC_URI = "http://sigrok.org/download/source/libsigrok/libsigrok-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "e258d471b6d5eaa58daf927a0dc3ba67"
 SRC_URI[sha256sum] = "4d341f90b6220d3e8cb251dacf726c41165285612248f2c52d15df4590a1ce3c"
 
 FILES:${PN} += "${datadir}/*"
diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
index 45556afa8a..a051f90c43 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
+++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode/0001-configure.ac-add-py-3.10-support.patch
@@ -18,7 +18,7 @@ index 4802f35..e0e468f 100644
  # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
  SR_PKG_CHECK([python3], [SRD_PKGLIBS],
 -       [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
-+       [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
++       [python-3.13-embed], [python-3.12-embed], [python-3.11-embed], [python-3.10-embed], [python-3.9-embed], [python-3.8-embed], [python-3.8 >= 3.8], [python-3.7 >= 3.7], [python-3.6 >= 3.6], [python-3.5 >= 3.5], [python-3.4 >= 3.4], [python-3.3 >= 3.3], [python-3.2 >= 3.2], [python3 >= 3.2])
  AS_IF([test "x$sr_have_python3" = xno],
         [AC_MSG_ERROR([Cannot find Python 3 development headers.])])
  
diff --git a/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb b/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
index 24091bcf90..4ea2287e40 100644
--- a/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
+++ b/meta-oe/recipes-extended/sigrok/libsigrokdecode_0.5.3.bb
@@ -13,5 +13,4 @@ SRC_URI = "http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-${P
            file://0001-configure.ac-add-py-3.10-support.patch \
            "
 
-SRC_URI[md5sum] = "7ba4ed4ef1f06ae96979751e096c2821"
 SRC_URI[sha256sum] = "c50814aa6743cd8c4e88c84a0cdd8889d883c3be122289be90c63d7d67883fc0"
diff --git a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb
index 48f96cc435..f9da51fe6c 100644
--- a/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb
+++ b/meta-oe/recipes-extended/sigrok/sigrok-cli_0.7.2.bb
@@ -13,7 +13,6 @@ PACKAGECONFIG ??= "decode"
 inherit autotools pkgconfig mime-xdg
 
 SRC_URI = "http://sigrok.org/download/source/sigrok-cli/sigrok-cli-${PV}.tar.gz"
-SRC_URI[md5sum] = "856fd496cd99d1091aa128405c522a36"
 SRC_URI[sha256sum] = "71d0443f36897bf565732dec206830dbea0f2789b6601cf10536b286d1140ab8"
 
 FILES:${PN} += "${datadir}/icons/hicolor"
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb
index f387147412..bd92b16299 100644
--- a/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb
+++ b/meta-oe/recipes-extended/smartmontools/smartmontools_7.4.bb
@@ -33,13 +33,13 @@ SYSTEMD_AUTO_ENABLE = "disable"
 do_install:append () {
     #install the init.d/smartd
     install -d ${D}${sysconfdir}/init.d
-    install -p -m 0755 ${WORKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd
+    install -p -m 0755 ${UNPACKDIR}/initd.smartd ${D}${sysconfdir}/init.d/smartd
     install -d ${D}${sysconfdir}/default
-    install -p -m 0644 ${WORKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools
+    install -p -m 0644 ${UNPACKDIR}/smartmontools.default ${D}${sysconfdir}/default/smartmontools
 
     #install systemd service file
     install -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/smartd.service ${D}${systemd_unitdir}/system
+    install -m 0644 ${UNPACKDIR}/smartd.service ${D}${systemd_unitdir}/system
     sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
         -e 's,@SYSCONFDIR@,${sysconfdir},g' \
         -e 's,@SBINDIR@,${sbindir},g' \
diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
index bc3bc3aa47..2a49ba99b0 100644
--- a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
+++ b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb
@@ -15,7 +15,6 @@ SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \
 
 SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83"
 
-S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
index ab97356e9b..530e38ce21 100644
--- a/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
+++ b/meta-oe/recipes-extended/socketcan/can-isotp_git.bb
@@ -5,8 +5,9 @@ PV = "1.0+git"
 
 SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master"
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit module
 
diff --git a/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch b/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
new file mode 100644
index 0000000000..91b9dd3c4e
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/can-utils/0001-Include-time.h-for-timespec-struct-definition.patch
@@ -0,0 +1,28 @@
+From 4363ef59cc9f2169455f56453759d4a4d9b89a5f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 13 Feb 2025 22:14:47 -0800
+Subject: [PATCH] Include time.h for timespec struct definition
+
+Fixes
+git/isobusfs/../libj1939.h:33:18: error: field has incomplete type 'struct timespec'
+   33 |         struct timespec next_send_time;
+      |                         ^
+
+Upstream-Status: Submitted [https://github.com/linux-can/can-utils/pull/579]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libj1939.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libj1939.h b/libj1939.h
+index 44393a2..7c19f43 100644
+--- a/libj1939.h
++++ b/libj1939.h
+@@ -17,6 +17,7 @@
+ #include <linux/can/j1939.h>
+ #include <stdbool.h>
+ #include <stdint.h>
++#include <time.h>
+ #include <sys/socket.h>
+ 
+ #ifndef J1939_LIB_H
diff --git a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
index ca6cb7db58..5dc41bcb93 100644
--- a/meta-oe/recipes-extended/socketcan/can-utils_2023.03.bb
+++ b/meta-oe/recipes-extended/socketcan/can-utils_2025.01.bb
@@ -4,22 +4,46 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61
 
 DEPENDS = "libsocketcan"
 
-SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https;branch=master \
+           file://0001-Include-time.h-for-timespec-struct-definition.patch"
 
-SRCREV = "cfe41963f3425e9adb01a70cfaddedf5e5982720"
+SRCREV = "01083a64ebf28cc716efe2d2fd51c141042ae34b"
 
-S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig update-alternatives
+inherit cmake pkgconfig update-alternatives
 
-PACKAGES =+ "${PN}-access ${PN}-isotp ${PN}-j1939 ${PN}-cantest ${PN}-slcan ${PN}-log"
+PACKAGES =+ " \
+    ${PN}-access \
+    ${PN}-cantest \
+    ${PN}-isobusfs \
+    ${PN}-isobusfs-dev \
+    ${PN}-isotp \
+    ${PN}-j1939 \
+    ${PN}-log \
+    ${PN}-mcp251xfd \
+    ${PN}-slcan \
+"
 
 FILES:${PN}-access = " \
     ${bindir}/cangw \
     ${bindir}/canlogserver \
     ${bindir}/bcmserver \
-    ${bindir}/socketcand \
-    ${bindir}/cannelloni \
+"
+
+FILES:${PN}-cantest = " \
+    ${bindir}/canbusload \
+    ${bindir}/can-calc-bit-timing \
+    ${bindir}/canfdtest \
+"
+
+FILES:${PN}-isobusfs = " \
+    ${bindir}/isobusfs-cli \
+    ${bindir}/isobusfs-srv \
+    ${libdir}/libisobusfs.so \
+"
+
+FILES:${PN}-isobusfs-dev = " \
+    ${includedir}/isobusfs* \
 "
 
 FILES:${PN}-isotp = "${bindir}/isotp*"
@@ -29,16 +53,14 @@ FILES:${PN}-j1939 = " \
     ${bindir}/testj1939 \
 "
 
-FILES:${PN}-cantest = " \
-    ${bindir}/canbusload \
-    ${bindir}/can-calc-bit-timing \
-    ${bindir}/canfdtest \
+FILES:${PN}-log = "${bindir}/*log*"
+
+FILES:${PN}-mcp251xfd = " \
+    ${bindir}/mcp251xfd* \
 "
 
 FILES:${PN}-slcan = "${bindir}/slcan*"
 
-FILES:${PN}-log = "${bindir}/*log*"
-
 ALTERNATIVE:${PN} = "candump cansend cansequence"
 ALTERNATIVE_LINK_NAME[candump] = "${bindir}/candump"
 ALTERNATIVE_LINK_NAME[cansend] = "${bindir}/cansend"
@@ -46,5 +68,4 @@ ALTERNATIVE_LINK_NAME[cansequence] = "${bindir}/cansequence"
 
 # busybox ip fails to configure can interfaces, so we need iproute2 to do so.
 # See details in http://www.armadeus.com/wiki/index.php?title=CAN_bus_Linux_driver.
-RRECOMMENDS:${PN} += "iproute2"
-
+RRECOMMENDS:${PN} += "iproute2-ip"
diff --git a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
index ab4710e81f..b92b8086d6 100644
--- a/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
+++ b/meta-oe/recipes-extended/socketcan/canutils_4.0.6.bb
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "libsocketcan"
 
 SRCREV = "299dff7f5322bf0348dcdd60071958ebedf5f09d"
-SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=git;branch=master \
+SRC_URI = "git://git.pengutronix.de/git/tools/canutils.git;protocol=https;branch=master \
     file://0001-canutils-candump-Add-error-frame-s-handling.patch \
 "
 
 inherit update-alternatives
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
index 9f6ef85c87..535f37f84c 100644
--- a/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
+++ b/meta-oe/recipes-extended/socketcan/libsocketcan_0.0.12.bb
@@ -7,9 +7,8 @@ LIC_FILES_CHKSUM = "file://src/libsocketcan.c;beginline=3;endline=17;md5=97e38ad
 
 SRCREV = "077def398ad303043d73339112968e5112d8d7c8"
 
-SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=git;branch=master"
+SRC_URI = "git://git.pengutronix.de/git/tools/libsocketcan.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/socketcan/socketcand_git.bb b/meta-oe/recipes-extended/socketcan/socketcand_git.bb
new file mode 100644
index 0000000000..ba69875c93
--- /dev/null
+++ b/meta-oe/recipes-extended/socketcan/socketcand_git.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Socketcand, socketcan over tcp/ip"
+LICENSE = "GPL-2.0-only | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause;md5=4c00cf8b0a04a9441d8fa24850231d00 \
+    file://LICENSES/GPL-2.0-only.txt;md5=f9d20a453221a1b7e32ae84694da2c37 \
+"
+
+SRC_URI = "git://github.com/linux-can/socketcand;branch=master;protocol=https"
+SRCREV = "998b0394d028e791aa97d549bfc686b4fbadf5ee"
+
+inherit meson pkgconfig
+
+PACKAGECONFIG ?= "libconfig libsocketcan"
+PACKAGECONFIG[libconfig] = "-Dlibconfig=true,-Dlibconfig=false,libconfig"
+PACKAGECONFIG[libsocketcan] = "-Dlibsocketcan=true,-Dlibsocketcan=false,libsocketcan"
diff --git a/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..9a81f1c74c
--- /dev/null
+++ b/meta-oe/recipes-extended/sysdig/sysdig/0001-libsinsp-fix-build-with-gcc-15.patch
@@ -0,0 +1,31 @@
+From 47a86dabd065096ffc8818a1cffca96964d18120 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@gmail.com>
+Date: Tue, 22 Apr 2025 18:43:46 +0200
+Subject: [PATCH] libsinsp: fix build with gcc-15
+
+fixes:
+http://errors.yoctoproject.org/Errors/Details/852848/
+
+In file included from TOPDIR/tmp/work/core2-64-oe-linux/sysdig/0.28.0/git/falcosecurity-libs/userspace/chisel/lua_parser.cpp:20:
+TOPDIR/tmp/work/core2-64-oe-linux/sysdig/0.28.0/git/falcosecurity-libs/userspace/libsinsp/./gen_filter.h:87:17: error: 'uint64_t' does not name a type
+   87 |         virtual uint64_t get_ts() const = 0;
+      |                 ^~~~~~~~
+
+Upstream-Status: Pending [gen_filter is removed in newer version with https://github.com/falcosecurity/libs/commit/47e245f3d343eff27ed178ec2449caa3a01faabb]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ userspace/libsinsp/gen_filter.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/userspace/libsinsp/gen_filter.h b/userspace/libsinsp/gen_filter.h
+index f4cfa08b1..79ac30dc3 100644
+--- a/userspace/libsinsp/gen_filter.h
++++ b/userspace/libsinsp/gen_filter.h
+@@ -16,6 +16,7 @@ along with Falco.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <set>
+ #include <list>
+ #include <map>
diff --git a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
index e814120ee6..b60f9c643c 100644
--- a/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
+++ b/meta-oe/recipes-extended/sysdig/sysdig_0.28.0.bb
@@ -23,16 +23,16 @@ DEPENDS += "libb64 lua${JIT} zlib c-ares grpc-native grpc curl ncurses jsoncpp \
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \
-           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=git/falcosecurity-libs \
+           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \
            file://0001-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \
            file://0001-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \
+           file://0001-libsinsp-fix-build-with-gcc-15.patch;patchdir=./falcosecurity-libs \
           "
 SRCREV_sysdig = "4fb6288275f567f63515df0ff0a6518043ecfa9b"
-SRCREV_falco= "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
+SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
 
 SRCREV_FORMAT = "sysdig_falco"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "\
                 -DBUILD_DRIVER=OFF \
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils/tipcutils.conf b/meta-oe/recipes-extended/tipcutils/tipcutils/tipcutils.conf
new file mode 100644
index 0000000000..39ed83d6af
--- /dev/null
+++ b/meta-oe/recipes-extended/tipcutils/tipcutils/tipcutils.conf
@@ -0,0 +1 @@
+tipc
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
index 596aa260e7..a4bf3eaaca 100644
--- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
+++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb
@@ -3,6 +3,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1b466cce98"
 
 SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \
+           file://tipcutils.conf \
            file://0001-include-sys-select.h-for-FD_-definitions.patch \
            file://0002-replace-non-standard-uint-with-unsigned-int.patch \
            file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \
@@ -11,13 +12,12 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \
 SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a"
 PV = "2.2.0+git"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
 
 DEPENDS += "libdaemon"
 
 RDEPENDS:${PN} = "iproute2-tipc"
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
     ( cd ${S}; ${S}/bootstrap )
@@ -41,8 +41,16 @@ do_install:append() {
     install -d ${D}${sysconfdir}
     cp -R --no-dereference --preserve=mode,links -v ${S}/scripts/etc/* ${D}${sysconfdir}/
     chown -R root:root ${D}${sysconfdir}
+
+    # Install systemd related configuration file
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/modules-load.d
+        install -m 0644 ${UNPACKDIR}/tipcutils.conf ${D}${sysconfdir}/modules-load.d
+    fi
 }
 
+SYSTEMD_SERVICE:${PN} = ""
+
 PACKAGES += "${PN}-demos"
 FILES:${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug"
 FILES:${PN}-demos = "/opt/tipcutils/*"
diff --git a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
index 4e66d8d05a..5fb28b0085 100644
--- a/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
+++ b/meta-oe/recipes-extended/tmate/tmate_2.4.0.bb
@@ -12,6 +12,5 @@ SRC_URI = "\
 
 SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
diff --git a/meta-oe/recipes-extended/tmux/tmux_3.3a.bb b/meta-oe/recipes-extended/tmux/tmux_3.5.bb
index 5187222838..33f709681d 100644
--- a/meta-oe/recipes-extended/tmux/tmux_3.3a.bb
+++ b/meta-oe/recipes-extended/tmux/tmux_3.5.bb
@@ -5,13 +5,13 @@ SECTION = "console/utils"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107"
 
-DEPENDS = "ncurses libevent"
+DEPENDS = "ncurses libevent bison-native"
 
 SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz"
-SRC_URI[md5sum] = "8eee5883b9f6550fa4efaad0c9ec38f3"
-SRC_URI[sha256sum] = "e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f"
+SRC_URI[sha256sum] = "2fe01942e7e7d93f524a22f2c883822c06bc258a4d61dba4b407353d7081950f"
 
 UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases"
+UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig
 
diff --git a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
index 0b14f9557a..1a453ebe10 100644
--- a/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
+++ b/meta-oe/recipes-extended/triggerhappy/triggerhappy_git.bb
@@ -9,9 +9,8 @@ SRCREV = "44a173195986d0d853316cb02a58785ded66c12b"
 PV = "0.5.0+git"
 SRC_URI = "git://github.com/wertarbyte/${BPN}.git;branch=debian;protocol=https"
 
-S = "${WORKDIR}/git"
 
-inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd
+inherit pkgconfig perlnative update-rc.d systemd
 
 PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
 PACKAGECONFIG[systemd] = ",,systemd"
@@ -30,7 +29,9 @@ FILES:${PN} = "\
 "
 CONFFILES:${PN} = "${sysconfdir}/udev/rules.d/80-triggerhappy.rules"
 
-do_install:append() {
+do_install() {
+    oe_runmake 'DESTDIR=${D}' 'BINDIR=${D}${sbindir}' install
+
     install -d ${D}${sysconfdir}/triggerhappy/triggers.d
 
     install -d ${D}${nonarch_base_libdir}/udev/rules.d
diff --git a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
index 6a99e8d29b..0e189b558f 100644
--- a/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
+++ b/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
@@ -11,11 +11,11 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_
            file://0001-cow.c-Replace-stat64-with-stat.patch \
            file://0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch \
            "
-SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
 SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"
 
+UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/user-mode-linux/files/tools/1/"
 
-S = "${WORKDIR}/tools"
+S = "${UNPACKDIR}/tools"
 
 inherit update-alternatives
 
diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
index 3aa766d0bd..616f4ca09a 100644
--- a/meta-oe/recipes-extended/upm/upm_git.bb
+++ b/meta-oe/recipes-extended/upm/upm_git.bb
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
 
 SRC_URI:append:toolchain-clang:x86 = " file://0001-nmea_gps-Link-with-latomic.patch "
 
-S = "${WORKDIR}/git"
 
 # Depends on mraa which only supports x86 and ARM for now
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
diff --git a/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch
new file mode 100644
index 0000000000..7dd064fc03
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch
@@ -0,0 +1,30 @@
+From a657a3c88488e761c05011400fcee5328fc797e1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 Sep 2019 20:04:26 -0700
+Subject: [PATCH] src: Do not reset FINAL_LIBS
+
+This helps case where additional libraries are needed to be passed from
+environment to get it going
+
+e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5919f01e9..e95050376 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -138,7 +138,7 @@ endif
+ 
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG)
+-FINAL_LIBS=-lm
++FINAL_LIBS+=-lm
+ DEBUG=-g -ggdb
+ 
+ # Linux ARM32 needs -latomic at linking time
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch
index 6e07c25c6a..bf6fc9ab24 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch
+++ b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch
@@ -1,4 +1,4 @@
-From a22512ac1cbd6de1f5646219722e49752d1f60ac Mon Sep 17 00:00:00 2001
+From 6414a404c3216e654cc6583ebda0c7b3bd304ecf Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -10,18 +10,18 @@ Fixes
 
 Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
 ---
  src/zmalloc.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/zmalloc.c b/src/zmalloc.c
-index ba03685..322304f 100644
+index 3abf9a31a..fa2f25c07 100644
 --- a/src/zmalloc.c
 +++ b/src/zmalloc.c
-@@ -32,6 +32,7 @@
- #include "config.h"
+@@ -33,6 +33,7 @@
  #include "solarisfixes.h"
+ #include "serverassert.h"
  
 +#define _GNU_SOURCE
  #include <stdio.h>
diff --git a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
new file mode 100644
index 0000000000..ffb365f371
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
@@ -0,0 +1,43 @@
+From a5bcf56630df520040076dd14c3c54fef0785ceb Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 17:39:52 -0600
+Subject: [PATCH] hiredis: use default CC if it is set
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Instead of trying to automagically figure out CC, which breaks with OE
+as CC has spaces in it, just skip it if one was already passed in.
+
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+
+Update to work with 4.0.8
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Reworked for 6.0.4
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
+Reworked for 8.0.0
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+
+Reworked for 8.1.0
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+Upstream-Status: Inappropriate [OE-specifc]
+---
+ deps/hiredis/Makefile | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
+index 4a3de1f6e..49bb525cd 100644
+--- a/deps/hiredis/Makefile
++++ b/deps/hiredis/Makefile
+@@ -36,8 +36,6 @@ endef
+ export REDIS_TEST_CONFIG
+ 
+ # Fallback to gcc when $CC is not in $PATH.
+-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+ OPTIMIZATION?=-O3
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ DEBUG_FLAGS?= -g -ggdb
diff --git a/meta-oe/recipes-extended/valkey/valkey/init-valkey-server b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
new file mode 100755
index 0000000000..8731795740
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/init-valkey-server
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          valkey-server
+# Required-Start:    $network
+# Required-Stop:     $network
+# Default-Start:     S 2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Redis, a key-value store
+# Description:       Redis is an open source, advanced key-value store.
+#                    http://valkey.io
+### END INIT INFO
+
+test -f /usr/bin/valkey-server || exit 0
+
+ARGS="/etc/valkey/valkey.conf"
+
+case "$1" in
+    start)
+        echo "Starting valkey-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS
+        ;;
+    stop)
+        echo "Stopping valkey-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server
+        ;;
+    restart)
+        echo "Stopping valkey-server..."
+        start-stop-daemon --stop --quiet --exec /usr/bin/valkey-server
+
+        # Since busybox implementation ignores --retry arguments repeatedly check
+        # if the process is still running and try another signal after a timeout,
+        # efectively simulating a stop with --retry=TERM/5/KILL/5 schedule.
+        waitAfterTerm=5000000 # us / 5000 ms / 5 s
+        waitAfterKill=5000000 # us / 5000 ms / 5 s
+        waitStep=100000 # us / 100 ms / 0.1 s
+        waited=0
+        start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+        processOff=$?
+        while [ $processOff -eq 0 ] && [ $waited -le $waitAfterTerm ] ; do
+            usleep ${waitStep}
+            ((waited+=${waitStep}))
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        done
+        if [ $processOff -eq 0 ] ; then
+            start-stop-daemon --stop --signal KILL --exec /usr/bin/valkey-server
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        fi
+        waited=0
+        while [ $processOff -eq 0 ] && [ $waited -le $waitAfterKill ] ; do
+            usleep ${waitStep}
+            ((waited+=${waitStep}))
+            start-stop-daemon --stop --test --quiet --exec /usr/bin/valkey-server
+            processOff=$?
+        done
+        # Here $processOff will indicate if waiting and retrying according to
+        # the schedule ended in a successfull stop or not.
+
+        echo "Starting valkey-server..."
+        start-stop-daemon --start --quiet --exec /usr/bin/valkey-server -- $ARGS
+        ;;
+    *)
+        echo "Usage: /etc/init.d/valkey-server {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+exit 0
+
diff --git a/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch
new file mode 100644
index 0000000000..b91684afd6
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch
@@ -0,0 +1,82 @@
+From 60487572d23cb374f8eb6b6560c385ecf6ad417e Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Fri, 8 Feb 2013 20:22:19 -0600
+Subject: [PATCH] lua: update Makefile to use environment build settings
+
+OE-specific parameters, instead of overriding all of these simply use
+the ones that are already passed in. Also configure for only Linux...
+
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+
+Updated to work with 3.0.x
+
+Signed-off-by: Armin Kuster <akust808@gmail.com>
+
+updated to work wtih 6.2.1
+Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+
+Updated to work with 8.1.x
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+Upstream-Status: Inappropriate [OE-specific]
+
+---
+ deps/Makefile         |  1 -
+ deps/lua/Makefile     |  1 -
+ deps/lua/src/Makefile | 16 ++++++----------
+ 3 files changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/deps/Makefile b/deps/Makefile
+index 72389def9..5d3ade528 100644
+--- a/deps/Makefile
++++ b/deps/Makefile
+@@ -95,7 +95,6 @@ endif
+ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
+ # challenging to cross-compile lua (and redis).  These defines make it easier
+ # to fit redis into cross-compilation environments, which typically set AR.
+-AR=ar
+ ARFLAGS=rc
+ 
+ lua: .make-prerequisites
+diff --git a/deps/lua/Makefile b/deps/lua/Makefile
+index 209a13244..72f4b2bf2 100644
+--- a/deps/lua/Makefile
++++ b/deps/lua/Makefile
+@@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644
+ 
+ # Utilities.
+ MKDIR= mkdir -p
+-RANLIB= ranlib
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
+diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile
+index f3bba2f81..1555ec028 100644
+--- a/deps/lua/src/Makefile
++++ b/deps/lua/src/Makefile
+@@ -5,18 +5,14 @@
+ # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+ 
+ # Your platform. See PLATS for possible values.
+-PLAT= none
++PLAT= linux
+ 
+-CC?= gcc
+-CFLAGS= -O2 -Wall $(MYCFLAGS)
+-AR= ar rcu
+-RANLIB= ranlib
+-RM= rm -f
+-LIBS= -lm $(MYLIBS)
+-
+-MYCFLAGS=
++MYCFLAGS=-DLUA_USE_LINUX
+ MYLDFLAGS=
+-MYLIBS=
++MYLIBS=-Wl,-E -ldl -lreadline -lhistory -lncurses
++
++CFLAGS += $(MYCFLAGS)
++LIBS += -lm $(MYLIBS)
+ 
+ # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ 
diff --git a/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch
new file mode 100644
index 0000000000..a711830e41
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch
@@ -0,0 +1,42 @@
+From 87bbb65c3c5fb7d248871d9c3bcbd3d27c781449 Mon Sep 17 00:00:00 2001
+From: Venture Research <tech@ventureresearch.com>
+Date: Wed, 6 Feb 2013 20:51:02 -0600
+Subject: [PATCH] hack to force use of libc malloc
+
+Hack to force libc usage as it seems the option to pass it in has been
+removed in favor of magic.
+
+Note that this of course doesn't allow tcmalloc and jemalloc, however
+jemalloc wasn't building correctly.
+
+Signed-off-by: Venture Research <tech@ventureresearch.com>
+
+Update to work with 4.0.8
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+
+Update to work with 8.0.0
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+
+Update to work with 8.1.0
+Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
+
+Upstream-Status: Inappropriate [Embedded specific]
+
+---
+ src/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 1437f41bd..5919f01e9 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,7 +13,8 @@
+ # Just use 'make dep', but this is only needed by developers.
+ 
+ release_hdr := $(shell sh -c './mkreleasehdr.sh')
+-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
++# use fake uname option to force use of generic libc
++uname_S := "USE_LIBC_MALLOC"
+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
+ CLANG := $(findstring clang,$(shell sh -c '$(CC) --version | head -1'))
+ 
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.conf b/meta-oe/recipes-extended/valkey/valkey/valkey.conf
new file mode 100644
index 0000000000..5efff8fd4c
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/valkey.conf
@@ -0,0 +1,1314 @@
+# Redis configuration file example.
+#
+# Note that in order to read the configuration file, Redis must be
+# started with the file path as first argument:
+#
+# ./valkey-server /path/to/valkey.conf
+
+# Note on units: when memory size is needed, it is possible to specify
+# it in the usual form of 1k 5GB 4M and so forth:
+#
+# 1k => 1000 bytes
+# 1kb => 1024 bytes
+# 1m => 1000000 bytes
+# 1mb => 1024*1024 bytes
+# 1g => 1000000000 bytes
+# 1gb => 1024*1024*1024 bytes
+#
+# units are case insensitive so 1GB 1Gb 1gB are all the same.
+
+################################## INCLUDES ###################################
+
+# Include one or more other config files here.  This is useful if you
+# have a standard template that goes to all Redis servers but also need
+# to customize a few per-server settings.  Include files can include
+# other files, so use this wisely.
+#
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
+# from admin or Redis Sentinel. Since Redis always uses the last processed
+# line as value of a configuration directive, you'd better put includes
+# at the beginning of this file to avoid overwriting config change at runtime.
+#
+# If instead you are interested in using includes to override configuration
+# options, it is better to use include as the last line.
+#
+# include /path/to/local.conf
+# include /path/to/other.conf
+
+################################## MODULES #####################################
+
+# Load modules at startup. If the server is not able to load modules
+# it will abort. It is possible to use multiple loadmodule directives.
+#
+# loadmodule /path/to/my_module.so
+# loadmodule /path/to/other_module.so
+
+################################## NETWORK #####################################
+
+# By default, if no "bind" configuration directive is specified, Redis listens
+# for connections from all the network interfaces available on the server.
+# It is possible to listen to just one or multiple selected interfaces using
+# the "bind" configuration directive, followed by one or more IP addresses.
+#
+# Examples:
+#
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
+#
+# ~~~ WARNING ~~~ If the computer running Redis is directly exposed to the
+# internet, binding to all the interfaces is dangerous and will expose the
+# instance to everybody on the internet. So by default we uncomment the
+# following bind directive, that will force Redis to listen only into
+# the IPv4 lookback interface address (this means Redis will be able to
+# accept connections only from clients running into the same computer it
+# is running).
+#
+# IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
+# JUST COMMENT THE FOLLOWING LINE.
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+bind 127.0.0.1
+
+# Protected mode is a layer of security protection, in order to avoid that
+# Redis instances left open on the internet are accessed and exploited.
+#
+# When protected mode is on and if:
+#
+# 1) The server is not binding explicitly to a set of addresses using the
+#    "bind" directive.
+# 2) No password is configured.
+#
+# The server only accepts connections from clients connecting from the
+# IPv4 and IPv6 loopback addresses 127.0.0.1 and ::1, and from Unix domain
+# sockets.
+#
+# By default protected mode is enabled. You should disable it only if
+# you are sure you want clients from other hosts to connect to Redis
+# even if no authentication is configured, nor a specific set of interfaces
+# are explicitly listed using the "bind" directive.
+protected-mode yes
+
+# Accept connections on the specified port, default is 6379 (IANA #815344).
+# If port 0 is specified Redis will not listen on a TCP socket.
+port 6379
+
+# TCP listen() backlog.
+#
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
+# will silently truncate it to the value of /proc/sys/net/core/somaxconn so
+# make sure to raise both the value of somaxconn and tcp_max_syn_backlog
+# in order to get the desired effect.
+tcp-backlog 511
+
+# Unix socket.
+#
+# Specify the path for the Unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/valkey.sock
+# unixsocketperm 700
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 0
+
+# TCP keepalive.
+#
+# If non-zero, use SO_KEEPALIVE to send TCP ACKs to clients in absence
+# of communication. This is useful for two reasons:
+#
+# 1) Detect dead peers.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
+#
+# On Linux, the specified value (in seconds) is the period used to send ACKs.
+# Note that to close the connection the double of the time is needed.
+# On other kernels the period depends on the kernel configuration.
+#
+# A reasonable value for this option is 300 seconds, which is the new
+# Redis default starting with Redis 3.2.1.
+tcp-keepalive 300
+
+################################# GENERAL #####################################
+
+# OE: run as a daemon.
+daemonize yes
+
+# If you run Redis from upstart or systemd, Redis can interact with your
+# supervision tree. Options:
+#   supervised no      - no supervision interaction
+#   supervised upstart - signal upstart by putting Redis into SIGSTOP mode
+#   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
+#   supervised auto    - detect upstart or systemd method based on
+#                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+# Note: these supervision methods only signal "process is ready."
+#       They do not enable continuous liveness pings back to your supervisor.
+supervised no
+
+# If a pid file is specified, Redis writes it where specified at startup
+# and removes it at exit.
+#
+# When the server runs non daemonized, no pid file is created if none is
+# specified in the configuration. When the server is daemonized, the pid file
+# is used even if not specified, defaulting to "/var/run/valkey.pid".
+#
+# Creating a pid file is best effort: if Redis is not able to create it
+# nothing bad happens, the server will start and run normally.
+
+# When running daemonized, Redis writes a pid file in /var/run/valkey.pid by
+# default. You can specify a custom pid file location here.
+pidfile /var/run/valkey.pid
+
+# Specify the server verbosity level.
+# This can be one of:
+# debug (a lot of information, useful for development/testing)
+# verbose (many rarely useful info, but not a mess like the debug level)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also the empty string can be used to force
+# Redis to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile ""
+
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+syslog-enabled yes
+
+# Specify the syslog identity.
+syslog-ident valkey
+
+# Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
+# Set the number of databases. The default database is DB 0, you can select
+# a different one on a per-connection basis using SELECT <dbid> where
+# dbid is a number between 0 and 'databases'-1
+databases 16
+
+# By default Redis shows an ASCII art logo only when started to log to the
+# standard output and if the standard output is a TTY. Basically this means
+# that normally a logo is displayed only in interactive sessions.
+#
+# However it is possible to force the pre-4.0 behavior and always show a
+# ASCII art logo in startup logs by setting the following option to yes.
+always-show-logo yes
+
+################################ SNAPSHOTTING  ################################
+#
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+#
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
+#   It is also possible to remove all the previously configured save
+#   points by adding a save directive with a single empty string argument
+#   like in the following example:
+#
+#   save ""
+
+#save 900 1
+#save 300 10
+#save 60 10000
+
+# OE: tune for a small embedded system with a limited # of keys.
+save 120 1
+save 60 100
+save 30 1000
+
+# By default Redis will stop accepting writes if RDB snapshots are enabled
+# (at least one save point) and the latest background save failed.
+# This will make the user aware (in a hard way) that data is not persisting
+# on disk properly, otherwise chances are that no one will notice and some
+# disaster will happen.
+#
+# If the background saving process will start working again Redis will
+# automatically allow writes again.
+#
+# However if you have setup your proper monitoring of the Redis server
+# and persistence, you may want to disable this feature so that Redis will
+# continue to work as usual even if there are problems with disk,
+# permissions, and so forth.
+stop-writes-on-bgsave-error yes
+
+# Compress string objects using LZF when dump .rdb databases?
+# For default that's set to 'yes' as it's almost always a win.
+# If you want to save some CPU in the saving child set it to 'no' but
+# the dataset will likely be bigger if you have compressible values or keys.
+rdbcompression yes
+
+# Since version 5 of RDB a CRC64 checksum is placed at the end of the file.
+# This makes the format more resistant to corruption but there is a performance
+# hit to pay (around 10%) when saving and loading RDB files, so you can disable it
+# for maximum performances.
+#
+# RDB files created with checksum disabled have a checksum of zero that will
+# tell the loading code to skip the check.
+rdbchecksum yes
+
+# The filename where to dump the DB
+dbfilename dump.rdb
+
+# The working directory.
+#
+# The DB will be written inside this directory, with the filename specified
+# above using the 'dbfilename' configuration directive.
+#
+# The Append Only File will also be created inside this directory.
+#
+# Note that you must specify a directory here, not a file name.
+dir /var/lib/valkey/
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. A few things to understand ASAP about Redis replication.
+#
+# 1) Redis replication is asynchronous, but you can configure a master to
+#    stop accepting writes if it appears to be not connected with at least
+#    a given number of slaves.
+# 2) Redis slaves are able to perform a partial resynchronization with the
+#    master if the replication link is lost for a relatively small amount of
+#    time. You may want to configure the replication backlog size (see the next
+#    sections of this file) with a sensible value depending on your needs.
+# 3) Replication is automatic and does not need user intervention. After a
+#    network partition slaves automatically try to reconnect to masters
+#    and resynchronize with them.
+#
+# slaveof <masterip> <masterport>
+
+# If the master is password protected (using the "requirepass" configuration
+# directive below) it is possible to tell the slave to authenticate before
+# starting the replication synchronization process, otherwise the master will
+# refuse the slave request.
+#
+# masterauth <master-password>
+
+# When a slave loses its connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of date data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale-data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
+
+# You can configure a slave instance to accept writes or not. Writing against
+# a slave instance may be useful to store some ephemeral data (because data
+# written on a slave will be easily deleted after resync with the master) but
+# may also cause problems if clients are writing to it because of a
+# misconfiguration.
+#
+# Since Redis 2.6 by default slaves are read-only.
+#
+# Note: read only slaves are not designed to be exposed to untrusted clients
+# on the internet. It's just a protection layer against misuse of the instance.
+# Still a read only slave exports by default all the administrative commands
+# such as CONFIG, DEBUG, and so forth. To a limited extent you can improve
+# security of read only slaves using 'rename-command' to shadow all the
+# administrative / dangerous commands.
+slave-read-only yes
+
+# Replication SYNC strategy: disk or socket.
+#
+# -------------------------------------------------------
+# WARNING: DISKLESS REPLICATION IS EXPERIMENTAL CURRENTLY
+# -------------------------------------------------------
+#
+# New slaves and reconnecting slaves that are not able to continue the replication
+# process just receiving differences, need to do what is called a "full
+# synchronization". An RDB file is transmitted from the master to the slaves.
+# The transmission can happen in two different ways:
+#
+# 1) Disk-backed: The Redis master creates a new process that writes the RDB
+#                 file on disk. Later the file is transferred by the parent
+#                 process to the slaves incrementally.
+# 2) Diskless: The Redis master creates a new process that directly writes the
+#              RDB file to slave sockets, without touching the disk at all.
+#
+# With disk-backed replication, while the RDB file is generated, more slaves
+# can be queued and served with the RDB file as soon as the current child producing
+# the RDB file finishes its work. With diskless replication instead once
+# the transfer starts, new slaves arriving will be queued and a new transfer
+# will start when the current one terminates.
+#
+# When diskless replication is used, the master waits a configurable amount of
+# time (in seconds) before starting the transfer in the hope that multiple slaves
+# will arrive and the transfer can be parallelized.
+#
+# With slow disks and fast (large bandwidth) networks, diskless replication
+# works better.
+repl-diskless-sync no
+
+# When diskless replication is enabled, it is possible to configure the delay
+# the server waits in order to spawn the child that transfers the RDB via socket
+# to the slaves.
+#
+# This is important since once the transfer starts, it is not possible to serve
+# new slaves arriving, that will be queued for the next RDB transfer, so the server
+# waits a delay in order to let more slaves arrive.
+#
+# The delay is specified in seconds, and by default is 5 seconds. To disable
+# it entirely just set it to 0 seconds and the transfer will start ASAP.
+repl-diskless-sync-delay 5
+
+# Slaves send PINGs to server in a predefined interval. It's possible to change
+# this interval with the repl_ping_slave_period option. The default value is 10
+# seconds.
+#
+# repl-ping-slave-period 10
+
+# The following option sets the replication timeout for:
+#
+# 1) Bulk transfer I/O during SYNC, from the point of view of slave.
+# 2) Master timeout from the point of view of slaves (data, pings).
+# 3) Slave timeout from the point of view of masters (REPLCONF ACK pings).
+#
+# It is important to make sure that this value is greater than the value
+# specified for repl-ping-slave-period otherwise a timeout will be detected
+# every time there is low traffic between the master and the slave.
+#
+# repl-timeout 60
+
+# Disable TCP_NODELAY on the slave socket after SYNC?
+#
+# If you select "yes" Redis will use a smaller number of TCP packets and
+# less bandwidth to send data to slaves. But this can add a delay for
+# the data to appear on the slave side, up to 40 milliseconds with
+# Linux kernels using a default configuration.
+#
+# If you select "no" the delay for data to appear on the slave side will
+# be reduced but more bandwidth will be used for replication.
+#
+# By default we optimize for low latency, but in very high traffic conditions
+# or when the master and slaves are many hops away, turning this to "yes" may
+# be a good idea.
+repl-disable-tcp-nodelay no
+
+# Set the replication backlog size. The backlog is a buffer that accumulates
+# slave data when slaves are disconnected for some time, so that when a slave
+# wants to reconnect again, often a full resync is not needed, but a partial
+# resync is enough, just passing the portion of data the slave missed while
+# disconnected.
+#
+# The bigger the replication backlog, the longer the time the slave can be
+# disconnected and later be able to perform a partial resynchronization.
+#
+# The backlog is only allocated once there is at least a slave connected.
+#
+# repl-backlog-size 1mb
+
+# After a master has no longer connected slaves for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last slave disconnected, for
+# the backlog buffer to be freed.
+#
+# Note that slaves never free the backlog for timeout, since they may be
+# promoted to masters later, and should be able to correctly "partially
+# resynchronize" with the slaves: hence they should always accumulate backlog.
+#
+# A value of 0 means to never release the backlog.
+#
+# repl-backlog-ttl 3600
+
+# The slave priority is an integer number published by Redis in the INFO output.
+# It is used by Redis Sentinel in order to select a slave to promote into a
+# master if the master is no longer working correctly.
+#
+# A slave with a low priority number is considered better for promotion, so
+# for instance if there are three slaves with priority 10, 100, 25 Sentinel will
+# pick the one with priority 10, that is the lowest.
+#
+# However a special priority of 0 marks the slave as not able to perform the
+# role of master, so a slave with priority of 0 will never be selected by
+# Redis Sentinel for promotion.
+#
+# By default the priority is 100.
+slave-priority 100
+
+# It is possible for a master to stop accepting writes if there are less than
+# N slaves connected, having a lag less or equal than M seconds.
+#
+# The N slaves need to be in "online" state.
+#
+# The lag in seconds, that must be <= the specified value, is calculated from
+# the last ping received from the slave, that is usually sent every second.
+#
+# This option does not GUARANTEE that N replicas will accept the write, but
+# will limit the window of exposure for lost writes in case not enough slaves
+# are available, to the specified number of seconds.
+#
+# For example to require at least 3 slaves with a lag <= 10 seconds use:
+#
+# min-slaves-to-write 3
+# min-slaves-max-lag 10
+#
+# Setting one or the other to 0 disables the feature.
+#
+# By default min-slaves-to-write is set to 0 (feature disabled) and
+# min-slaves-max-lag is set to 10.
+
+# A Redis master is able to list the address and port of the attached
+# slaves in different ways. For example the "INFO replication" section
+# offers this information, which is used, among other tools, by
+# Redis Sentinel in order to discover slave instances.
+# Another place where this info is available is in the output of the
+# "ROLE" command of a master.
+#
+# The listed IP and address normally reported by a slave is obtained
+# in the following way:
+#
+#   IP: The address is auto detected by checking the peer address
+#   of the socket used by the slave to connect with the master.
+#
+#   Port: The port is communicated by the slave during the replication
+#   handshake, and is normally the port that the slave is using to
+#   list for connections.
+#
+# However when port forwarding or Network Address Translation (NAT) is
+# used, the slave may be actually reachable via different IP and port
+# pairs. The following two options can be used by a slave in order to
+# report to its master a specific set of IP and port, so that both INFO
+# and ROLE will report those values.
+#
+# There is no need to use both the options if you need to override just
+# the port or the IP address.
+#
+# slave-announce-ip 5.5.5.5
+# slave-announce-port 1234
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running valkey-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+#
+# Warning: since Redis is pretty fast an outside user can try up to
+# 150k passwords per second against a good box. This means that you should
+# use a very strong password otherwise it will be very easy to break.
+#
+# requirepass foobared
+
+# Command renaming.
+#
+# It is possible to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# hard to guess so that it will still be available for internal-use tools
+# but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possible to completely kill a command by renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+#
+# Please note that changing the name of commands that are logged into the
+# AOF file or transmitted to slaves may cause problems.
+
+################################### CLIENTS ####################################
+
+# Set the max number of connected clients at the same time. By default
+# this limit is set to 10000 clients, however if the Redis server is not
+# able to configure the process file limit to allow for the specified limit
+# the max number of allowed clients is set to the current file limit
+# minus 32 (as Redis reserves a few file descriptors for internal uses).
+#
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+#
+# maxclients 10000
+
+############################## MEMORY MANAGEMENT ################################
+
+# Set a memory usage limit to the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys
+# according to the eviction policy selected (see maxmemory-policy).
+#
+# If Redis can't remove keys according to the policy, or if the policy is
+# set to 'noeviction', Redis will start to reply with errors to commands
+# that would use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to read-only commands like GET.
+#
+# This option is usually useful when using Redis as an LRU or LFU cache, or to
+# set a hard memory limit for an instance (using the 'noeviction' policy).
+#
+# WARNING: If you have slaves attached to an instance with maxmemory on,
+# the size of the output buffers needed to feed the slaves are subtracted
+# from the used memory count, so that network problems / resyncs will
+# not trigger a loop where keys are evicted, and in turn the output
+# buffer of slaves is full with DELs of keys evicted triggering the deletion
+# of more keys, and so forth until the database is completely emptied.
+#
+# In short... if you have slaves attached it is suggested that you set a lower
+# limit for maxmemory so that there is some free RAM on the system for slave
+# output buffers (but this is not needed if the policy is 'noeviction').
+#
+# maxmemory <bytes>
+
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached. You can select among five behaviors:
+#
+# volatile-lru -> Evict using approximated LRU among the keys with an expire set.
+# allkeys-lru -> Evict any key using approximated LRU.
+# volatile-lfu -> Evict using approximated LFU among the keys with an expire set.
+# allkeys-lfu -> Evict any key using approximated LFU.
+# volatile-random -> Remove a random key among the ones with an expire set.
+# allkeys-random -> Remove a random key, any key.
+# volatile-ttl -> Remove the key with the nearest expire time (minor TTL)
+# noeviction -> Don't evict anything, just return an error on write operations.
+#
+# LRU means Least Recently Used
+# LFU means Least Frequently Used
+#
+# Both LRU, LFU and volatile-ttl are implemented using approximated
+# randomized algorithms.
+#
+# Note: with any of the above policies, Redis will return an error on write
+#       operations, when there are no suitable keys for eviction.
+#
+#       At the date of writing these commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy noeviction
+
+# LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can tune it for speed or
+# accuracy. For default Redis will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
+# configuration directive.
+#
+# The default of 5 produces good enough results. 10 Approximates very closely
+# true LRU but costs more CPU. 3 is faster but not very accurate.
+#
+# maxmemory-samples 5
+
+############################# LAZY FREEING ####################################
+
+# Redis has two primitives to delete keys. One is called DEL and is a blocking
+# deletion of the object. It means that the server stops processing new commands
+# in order to reclaim all the memory associated with an object in a synchronous
+# way. If the key deleted is associated with a small object, the time needed
+# in order to execute the DEL command is very small and comparable to most other
+# O(1) or O(log_N) commands in Redis. However if the key is associated with an
+# aggregated value containing millions of elements, the server can block for
+# a long time (even seconds) in order to complete the operation.
+#
+# For the above reasons Redis also offers non blocking deletion primitives
+# such as UNLINK (non blocking DEL) and the ASYNC option of FLUSHALL and
+# FLUSHDB commands, in order to reclaim memory in background. Those commands
+# are executed in constant time. Another thread will incrementally free the
+# object in the background as fast as possible.
+#
+# DEL, UNLINK and ASYNC option of FLUSHALL and FLUSHDB are user-controlled.
+# It's up to the design of the application to understand when it is a good
+# idea to use one or the other. However the Redis server sometimes has to
+# delete keys or flush the whole database as a side effect of other operations.
+# Specifically Redis deletes objects independently of a user call in the
+# following scenarios:
+#
+# 1) On eviction, because of the maxmemory and maxmemory policy configurations,
+#    in order to make room for new data, without going over the specified
+#    memory limit.
+# 2) Because of expire: when a key with an associated time to live (see the
+#    EXPIRE command) must be deleted from memory.
+# 3) Because of a side effect of a command that stores data on a key that may
+#    already exist. For example the RENAME command may delete the old key
+#    content when it is replaced with another one. Similarly SUNIONSTORE
+#    or SORT with STORE option may delete existing keys. The SET command
+#    itself removes any old content of the specified key in order to replace
+#    it with the specified string.
+# 4) During replication, when a slave performs a full resynchronization with
+#    its master, the content of the whole database is removed in order to
+#    load the RDB file just transfered.
+#
+# In all the above cases the default is to delete objects in a blocking way,
+# like if DEL was called. However you can configure each case specifically
+# in order to instead release memory in a non-blocking way like if UNLINK
+# was called, using the following configuration directives:
+
+lazyfree-lazy-eviction no
+lazyfree-lazy-expire no
+lazyfree-lazy-server-del no
+slave-lazy-flush no
+
+############################## APPEND ONLY MODE ###############################
+
+# By default Redis asynchronously dumps the dataset on disk. This mode is
+# good enough in many applications, but an issue with the Redis process or
+# a power outage may result into a few minutes of writes lost (depending on
+# the configured save points).
+#
+# The Append Only File is an alternative persistence mode that provides
+# much better durability. For instance using the default data fsync policy
+# (see later in the config file) Redis can lose just one second of writes in a
+# dramatic event like a server power outage, or a single write if something
+# wrong with the Redis process itself happens, but the operating system is
+# still running correctly.
+#
+# AOF and RDB persistence can be enabled at the same time without problems.
+# If the AOF is enabled on startup Redis will load the AOF, that is the file
+# with the better durability guarantees.
+#
+# Please check http://valkey.io/topics/persistence for more information.
+
+# OE: changed default to enable this
+appendonly yes
+
+# The name of the append only file (default: "appendonly.aof")
+
+appendfilename "appendonly.aof"
+
+# The fsync() call tells the Operating System to actually write data on disk
+# instead of waiting for more data in the output buffer. Some OS will really flush
+# data on disk, some other OS will just try to do it ASAP.
+#
+# Redis supports three different modes:
+#
+# no: don't fsync, just let the OS flush the data when it wants. Faster.
+# always: fsync after every write to the append only log. Slow, Safest.
+# everysec: fsync only one time every second. Compromise.
+#
+# The default is "everysec", as that's usually the right compromise between
+# speed and data safety. It's up to you to understand if you can relax this to
+# "no" that will let the operating system flush the output buffer when
+# it wants, for better performances (but if you can live with the idea of
+# some data loss consider the default persistence mode that's snapshotting),
+# or on the contrary, use "always" that's very slow but a bit safer than
+# everysec.
+#
+# More details please check the following article:
+# http://antirez.com/post/valkey-persistence-demystified.html
+#
+# If unsure, use "everysec".
+
+# appendfsync always
+appendfsync everysec
+# appendfsync no
+
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving, the durability of Redis is
+# the same as "appendfsync none". In practical terms, this means that it is
+# possible to lose up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+#
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+
+no-appendfsync-on-rewrite no
+
+# Automatic rewrite of the append only file.
+# Redis is able to automatically rewrite the log file implicitly calling
+# BGREWRITEAOF when the AOF log size grows by the specified percentage.
+#
+# This is how it works: Redis remembers the size of the AOF file after the
+# latest rewrite (if no rewrite has happened since the restart, the size of
+# the AOF at startup is used).
+#
+# This base size is compared to the current size. If the current size is
+# bigger than the specified percentage, the rewrite is triggered. Also
+# you need to specify a minimal size for the AOF file to be rewritten, this
+# is useful to avoid rewriting the AOF file even if the percentage increase
+# is reached but it is still pretty small.
+#
+# Specify a percentage of zero in order to disable the automatic AOF
+# rewrite feature.
+
+auto-aof-rewrite-percentage 100
+auto-aof-rewrite-min-size 64mb
+
+# An AOF file may be found to be truncated at the end during the Redis
+# startup process, when the AOF data gets loaded back into memory.
+# This may happen when the system where Redis is running
+# crashes, especially when an ext4 filesystem is mounted without the
+# data=ordered option (however this can't happen when Redis itself
+# crashes or aborts but the operating system still works correctly).
+#
+# Redis can either exit with an error when this happens, or load as much
+# data as possible (the default now) and start if the AOF file is found
+# to be truncated at the end. The following option controls this behavior.
+#
+# If aof-load-truncated is set to yes, a truncated AOF file is loaded and
+# the Redis server starts emitting a log to inform the user of the event.
+# Otherwise if the option is set to no, the server aborts with an error
+# and refuses to start. When the option is set to no, the user requires
+# to fix the AOF file using the "valkey-check-aof" utility before to restart
+# the server.
+#
+# Note that if the AOF file will be found to be corrupted in the middle
+# the server will still exit with an error. This option only applies when
+# Redis will try to read more data from the AOF file but not enough bytes
+# will be found.
+aof-load-truncated yes
+
+# When rewriting the AOF file, Redis is able to use an RDB preamble in the
+# AOF file for faster rewrites and recoveries. When this option is turned
+# on the rewritten AOF file is composed of two different stanzas:
+#
+#   [RDB file][AOF tail]
+#
+# When loading Redis recognizes that the AOF file starts with the "REDIS"
+# string and loads the prefixed RDB file, and continues loading the AOF
+# tail.
+#
+# This is currently turned off by default in order to avoid the surprise
+# of a format change, but will at some point be used as the default.
+aof-use-rdb-preamble no
+
+################################ LUA SCRIPTING  ###############################
+
+# Max execution time of a Lua script in milliseconds.
+#
+# If the maximum execution time is reached Redis will log that a script is
+# still in execution after the maximum allowed time and will start to
+# reply to queries with an error.
+#
+# When a long running script exceeds the maximum execution time only the
+# SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
+# used to stop a script that did not yet called write commands. The second
+# is the only way to shut down the server in the case a write command was
+# already issued by the script but the user doesn't want to wait for the natural
+# termination of the script.
+#
+# Set it to 0 or a negative value for unlimited execution without warnings.
+lua-time-limit 5000
+
+################################ REDIS CLUSTER  ###############################
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however
+# in order to mark it as "mature" we need to wait for a non trivial percentage
+# of users to deploy it in production.
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+# Normal Redis instances can't be part of a Redis Cluster; only nodes that are
+# started as cluster nodes can. In order to start a Redis instance as a
+# cluster node enable the cluster support uncommenting the following:
+#
+# cluster-enabled yes
+
+# Every cluster node has a cluster configuration file. This file is not
+# intended to be edited by hand. It is created and updated by Redis nodes.
+# Every Redis Cluster node requires a different cluster configuration file.
+# Make sure that instances running in the same system do not have
+# overlapping cluster configuration file names.
+#
+# cluster-config-file nodes-6379.conf
+
+# Cluster node timeout is the amount of milliseconds a node must be unreachable
+# for it to be considered in failure state.
+# Most other internal time limits are multiple of the node timeout.
+#
+# cluster-node-timeout 15000
+
+# A slave of a failing master will avoid to start a failover if its data
+# looks too old.
+#
+# There is no simple way for a slave to actually have an exact measure of
+# its "data age", so the following two checks are performed:
+#
+# 1) If there are multiple slaves able to failover, they exchange messages
+#    in order to try to give an advantage to the slave with the best
+#    replication offset (more data from the master processed).
+#    Slaves will try to get their rank by offset, and apply to the start
+#    of the failover a delay proportional to their rank.
+#
+# 2) Every single slave computes the time of the last interaction with
+#    its master. This can be the last ping or command received (if the master
+#    is still in the "connected" state), or the time that elapsed since the
+#    disconnection with the master (if the replication link is currently down).
+#    If the last interaction is too old, the slave will not try to failover
+#    at all.
+#
+# The point "2" can be tuned by user. Specifically a slave will not perform
+# the failover if, since the last interaction with the master, the time
+# elapsed is greater than:
+#
+#   (node-timeout * slave-validity-factor) + repl-ping-slave-period
+#
+# So for example if node-timeout is 30 seconds, and the slave-validity-factor
+# is 10, and assuming a default repl-ping-slave-period of 10 seconds, the
+# slave will not try to failover if it was not able to talk with the master
+# for longer than 310 seconds.
+#
+# A large slave-validity-factor may allow slaves with too old data to failover
+# a master, while a too small value may prevent the cluster from being able to
+# elect a slave at all.
+#
+# For maximum availability, it is possible to set the slave-validity-factor
+# to a value of 0, which means, that slaves will always try to failover the
+# master regardless of the last time they interacted with the master.
+# (However they'll always try to apply a delay proportional to their
+# offset rank).
+#
+# Zero is the only value able to guarantee that when all the partitions heal
+# the cluster will always be able to continue.
+#
+# cluster-slave-validity-factor 10
+
+# Cluster slaves are able to migrate to orphaned masters, that are masters
+# that are left without working slaves. This improves the cluster ability
+# to resist to failures as otherwise an orphaned master can't be failed over
+# in case of failure if it has no working slaves.
+#
+# Slaves migrate to orphaned masters only if there are still at least a
+# given number of other working slaves for their old master. This number
+# is the "migration barrier". A migration barrier of 1 means that a slave
+# will migrate only if there is at least 1 other working slave for its master
+# and so forth. It usually reflects the number of slaves you want for every
+# master in your cluster.
+#
+# Default is 1 (slaves migrate only if their masters remain with at least
+# one slave). To disable migration just set it to a very large value.
+# A value of 0 can be set but is useful only for debugging and dangerous
+# in production.
+#
+# cluster-migration-barrier 1
+
+# By default Redis Cluster nodes stop accepting queries if they detect there
+# is at least an hash slot uncovered (no available node is serving it).
+# This way if the cluster is partially down (for example a range of hash slots
+# are no longer covered) all the cluster becomes, eventually, unavailable.
+# It automatically returns available as soon as all the slots are covered again.
+#
+# However sometimes you want the subset of the cluster which is working,
+# to continue to accept queries for the part of the key space that is still
+# covered. In order to do so, just set the cluster-require-full-coverage
+# option to no.
+#
+# cluster-require-full-coverage yes
+
+# In order to setup your cluster make sure to read the documentation
+# available at http://valkey.io web site.
+
+########################## CLUSTER DOCKER/NAT support  ########################
+
+# In certain deployments, Redis Cluster nodes address discovery fails, because
+# addresses are NAT-ted or because ports are forwarded (the typical case is
+# Docker and other containers).
+#
+# In order to make Redis Cluster working in such environments, a static
+# configuration where each node knows its public address is needed. The
+# following two options are used for this scope, and are:
+#
+# * cluster-announce-ip
+# * cluster-announce-port
+# * cluster-announce-bus-port
+#
+# Each instruct the node about its address, client port, and cluster message
+# bus port. The information is then published in the header of the bus packets
+# so that other nodes will be able to correctly map the address of the node
+# publishing the information.
+#
+# If the above options are not used, the normal Redis Cluster auto-detection
+# will be used instead.
+#
+# Note that when remapped, the bus port may not be at the fixed offset of
+# clients port + 10000, so you can specify any port and bus-port depending
+# on how they get remapped. If the bus-port is not set, a fixed offset of
+# 10000 will be used as usually.
+#
+# Example:
+#
+# cluster-announce-ip 10.1.1.5
+# cluster-announce-port 6379
+# cluster-announce-bus-port 6380
+
+################################## SLOW LOG ###################################
+
+# The Redis Slow Log is a system to log queries that exceeded a specified
+# execution time. The execution time does not include the I/O operations
+# like talking with the client, sending the reply and so forth,
+# but just the time needed to actually execute the command (this is the only
+# stage of command execution where the thread is blocked and can not serve
+# other requests in the meantime).
+#
+# You can configure the slow log with two parameters: one tells Redis
+# what is the execution time, in microseconds, to exceed in order for the
+# command to get logged, and the other parameter is the length of the
+# slow log. When a new command is logged the oldest one is removed from the
+# queue of logged commands.
+
+# The following time is expressed in microseconds, so 1000000 is equivalent
+# to one second. Note that a negative number disables the slow log, while
+# a value of zero forces the logging of every command.
+slowlog-log-slower-than 10000
+
+# There is no limit to this length. Just be aware that it will consume memory.
+# You can reclaim memory used by the slow log with SLOWLOG RESET.
+slowlog-max-len 128
+
+################################ LATENCY MONITOR ##############################
+
+# The Redis latency monitoring subsystem samples different operations
+# at runtime in order to collect data related to possible sources of
+# latency of a Redis instance.
+#
+# Via the LATENCY command this information is available to the user that can
+# print graphs and obtain reports.
+#
+# The system only logs operations that were performed in a time equal or
+# greater than the amount of milliseconds specified via the
+# latency-monitor-threshold configuration directive. When its value is set
+# to zero, the latency monitor is turned off.
+#
+# By default latency monitoring is disabled since it is mostly not needed
+# if you don't have latency issues, and collecting data has a performance
+# impact, that while very small, can be measured under big load. Latency
+# monitoring can easily be enabled at runtime using the command
+# "CONFIG SET latency-monitor-threshold <milliseconds>" if needed.
+latency-monitor-threshold 0
+
+############################# EVENT NOTIFICATION ##############################
+
+# Redis can notify Pub/Sub clients about events happening in the key space.
+# This feature is documented at http://valkey.io/topics/notifications
+#
+# For instance if keyspace events notification is enabled, and a client
+# performs a DEL operation on key "foo" stored in the Database 0, two
+# messages will be published via Pub/Sub:
+#
+# PUBLISH __keyspace@0__:foo del
+# PUBLISH __keyevent@0__:del foo
+#
+# It is possible to select the events that Redis will notify among a set
+# of classes. Every class is identified by a single character:
+#
+#  K     Keyspace events, published with __keyspace@<db>__ prefix.
+#  E     Keyevent events, published with __keyevent@<db>__ prefix.
+#  g     Generic commands (non-type specific) like DEL, EXPIRE, RENAME, ...
+#  $     String commands
+#  l     List commands
+#  s     Set commands
+#  h     Hash commands
+#  z     Sorted set commands
+#  x     Expired events (events generated every time a key expires)
+#  e     Evicted events (events generated when a key is evicted for maxmemory)
+#  A     Alias for g$lshzxe, so that the "AKE" string means all the events.
+#
+#  The "notify-keyspace-events" takes as argument a string that is composed
+#  of zero or multiple characters. The empty string means that notifications
+#  are disabled.
+#
+#  Example: to enable list and generic events, from the point of view of the
+#           event name, use:
+#
+#  notify-keyspace-events Elg
+#
+#  Example 2: to get the stream of the expired keys subscribing to channel
+#             name __keyevent@0__:expired use:
+#
+#  notify-keyspace-events Ex
+#
+#  By default all notifications are disabled because most users don't need
+#  this feature and the feature has some overhead. Note that if you don't
+#  specify at least one of K or E, no events will be delivered.
+notify-keyspace-events ""
+
+############################### ADVANCED CONFIG ###############################
+
+# Hashes are encoded using a memory efficient data structure when they have a
+# small number of entries, and the biggest entry does not exceed a given
+# threshold. These thresholds can be configured using the following directives.
+hash-max-ziplist-entries 512
+hash-max-ziplist-value 64
+
+# Lists are also encoded in a special way to save a lot of space.
+# The number of entries allowed per internal list node can be specified
+# as a fixed maximum size or a maximum number of elements.
+# For a fixed maximum size, use -5 through -1, meaning:
+# -5: max size: 64 Kb  <-- not recommended for normal workloads
+# -4: max size: 32 Kb  <-- not recommended
+# -3: max size: 16 Kb  <-- probably not recommended
+# -2: max size: 8 Kb   <-- good
+# -1: max size: 4 Kb   <-- good
+# Positive numbers mean store up to _exactly_ that number of elements
+# per list node.
+# The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
+# but if your use case is unique, adjust the settings as necessary.
+list-max-ziplist-size -2
+
+# Lists may also be compressed.
+# Compress depth is the number of quicklist ziplist nodes from *each* side of
+# the list to *exclude* from compression.  The head and tail of the list
+# are always uncompressed for fast push/pop operations.  Settings are:
+# 0: disable all list compression
+# 1: depth 1 means "don't start compressing until after 1 node into the list,
+#    going from either the head or tail"
+#    So: [head]->node->node->...->node->[tail]
+#    [head], [tail] will always be uncompressed; inner nodes will compress.
+# 2: [head]->[next]->node->node->...->node->[prev]->[tail]
+#    2 here means: don't compress head or head->next or tail->prev or tail,
+#    but compress all nodes between them.
+# 3: [head]->[next]->[next]->node->node->...->node->[prev]->[prev]->[tail]
+# etc.
+list-compress-depth 0
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happen to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
+
+# Similarly to hashes and lists, sorted sets are also specially encoded in
+# order to save a lot of space. This encoding is only used when the length and
+# elements of a sorted set are below the following limits:
+zset-max-ziplist-entries 128
+zset-max-ziplist-value 64
+
+# HyperLogLog sparse representation bytes limit. The limit includes the
+# 16 bytes header. When an HyperLogLog using the sparse representation crosses
+# this limit, it is converted into the dense representation.
+#
+# A value greater than 16000 is totally useless, since at that point the
+# dense representation is more memory efficient.
+#
+# The suggested value is ~ 3000 in order to have the benefits of
+# the space efficient encoding without slowing down too much PFADD,
+# which is O(N) with the sparse encoding. The value can be raised to
+# ~ 10000 when CPU is not a concern, but space is, and the data set is
+# composed of many HyperLogLogs with cardinality in the 0 - 15000 range.
+hll-sparse-max-bytes 3000
+
+# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
+# order to help rehashing the main Redis hash table (the one mapping top-level
+# keys to values). The hash table implementation Redis uses (see dict.c)
+# performs a lazy rehashing: the more operation you run into a hash table
+# that is rehashing, the more rehashing "steps" are performed, so if the
+# server is idle the rehashing is never complete and some more memory is used
+# by the hash table.
+#
+# The default is to use this millisecond 10 times every second in order to
+# actively rehash the main dictionaries, freeing memory when possible.
+#
+# If unsure:
+# use "activerehashing no" if you have hard latency requirements and it is
+# not a good thing in your environment that Redis can reply from time to time
+# to queries with 2 milliseconds delay.
+#
+# use "activerehashing yes" if you don't have such hard requirements but
+# want to free memory asap when possible.
+activerehashing yes
+
+# The client output buffer limits can be used to force disconnection of clients
+# that are not reading data from the server fast enough for some reason (a
+# common reason is that a Pub/Sub client can't consume messages as fast as the
+# publisher can produce them).
+#
+# The limit can be set differently for the three different classes of clients:
+#
+# normal -> normal clients including MONITOR clients
+# slave  -> slave clients
+# pubsub -> clients subscribed to at least one pubsub channel or pattern
+#
+# The syntax of every client-output-buffer-limit directive is the following:
+#
+# client-output-buffer-limit <class> <hard limit> <soft limit> <soft seconds>
+#
+# A client is immediately disconnected once the hard limit is reached, or if
+# the soft limit is reached and remains reached for the specified number of
+# seconds (continuously).
+# So for instance if the hard limit is 32 megabytes and the soft limit is
+# 16 megabytes / 10 seconds, the client will get disconnected immediately
+# if the size of the output buffers reach 32 megabytes, but will also get
+# disconnected if the client reaches 16 megabytes and continuously overcomes
+# the limit for 10 seconds.
+#
+# By default normal clients are not limited because they don't receive data
+# without asking (in a push way), but just after a request, so only
+# asynchronous clients may create a scenario where data is requested faster
+# than it can read.
+#
+# Instead there is a default limit for pubsub and slave clients, since
+# subscribers and slaves receive data in a push fashion.
+#
+# Both the hard or the soft limit can be disabled by setting them to zero.
+client-output-buffer-limit normal 0 0 0
+client-output-buffer-limit slave 256mb 64mb 60
+client-output-buffer-limit pubsub 32mb 8mb 60
+
+# Client query buffers accumulate new commands. They are limited to a fixed
+# amount by default in order to avoid that a protocol desynchronization (for
+# instance due to a bug in the client) will lead to unbound memory usage in
+# the query buffer. However you can configure it here if you have very special
+# needs, such us huge multi/exec requests or alike.
+#
+# client-query-buffer-limit 1gb
+
+# In the Redis protocol, bulk requests, that are, elements representing single
+# strings, are normally limited ot 512 mb. However you can change this limit
+# here.
+#
+# proto-max-bulk-len 512mb
+
+# Redis calls an internal function to perform many background tasks, like
+# closing connections of clients in timeout, purging expired keys that are
+# never requested, and so forth.
+#
+# Not all tasks are performed with the same frequency, but Redis checks for
+# tasks to perform according to the specified "hz" value.
+#
+# By default "hz" is set to 10. Raising the value will use more CPU when
+# Redis is idle, but at the same time will make Redis more responsive when
+# there are many keys expiring at the same time, and timeouts may be
+# handled with more precision.
+#
+# The range is between 1 and 500, however a value over 100 is usually not
+# a good idea. Most users should use the default of 10 and raise this up to
+# 100 only in environments where very low latency is required.
+hz 10
+
+# When a child rewrites the AOF file, if the following option is enabled
+# the file will be fsync-ed every 32 MB of data generated. This is useful
+# in order to commit the file to the disk more incrementally and avoid
+# big latency spikes.
+aof-rewrite-incremental-fsync yes
+
+# Redis LFU eviction (see maxmemory setting) can be tuned. However it is a good
+# idea to start with the default settings and only change them after investigating
+# how to improve the performances and how the keys LFU change over time, which
+# is possible to inspect via the OBJECT FREQ command.
+#
+# There are two tunable parameters in the Redis LFU implementation: the
+# counter logarithm factor and the counter decay time. It is important to
+# understand what the two parameters mean before changing them.
+#
+# The LFU counter is just 8 bits per key, it's maximum value is 255, so Redis
+# uses a probabilistic increment with logarithmic behavior. Given the value
+# of the old counter, when a key is accessed, the counter is incremented in
+# this way:
+#
+# 1. A random number R between 0 and 1 is extracted.
+# 2. A probability P is calculated as 1/(old_value*lfu_log_factor+1).
+# 3. The counter is incremented only if R < P.
+#
+# The default lfu-log-factor is 10. This is a table of how the frequency
+# counter changes with a different number of accesses with different
+# logarithmic factors:
+#
+# +--------+------------+------------+------------+------------+------------+
+# | factor | 100 hits   | 1000 hits  | 100K hits  | 1M hits    | 10M hits   |
+# +--------+------------+------------+------------+------------+------------+
+# | 0      | 104        | 255        | 255        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 1      | 18         | 49         | 255        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 10     | 10         | 18         | 142        | 255        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+# | 100    | 8          | 11         | 49         | 143        | 255        |
+# +--------+------------+------------+------------+------------+------------+
+#
+# NOTE: The above table was obtained by running the following commands:
+#
+#   valkey-benchmark -n 1000000 incr foo
+#   valkey-cli object freq foo
+#
+# NOTE 2: The counter initial value is 5 in order to give new objects a chance
+# to accumulate hits.
+#
+# The counter decay time is the time, in minutes, that must elapse in order
+# for the key counter to be divided by two (or decremented if it has a value
+# less <= 10).
+#
+# The default value for the lfu-decay-time is 1. A Special value of 0 means to
+# decay the counter every time it happens to be scanned.
+#
+# lfu-log-factor 10
+# lfu-decay-time 1
+
+########################### ACTIVE DEFRAGMENTATION #######################
+#
+# WARNING THIS FEATURE IS EXPERIMENTAL. However it was stress tested
+# even in production and manually tested by multiple engineers for some
+# time.
+#
+# What is active defragmentation?
+# -------------------------------
+#
+# Active (online) defragmentation allows a Redis server to compact the
+# spaces left between small allocations and deallocations of data in memory,
+# thus allowing to reclaim back memory.
+#
+# Fragmentation is a natural process that happens with every allocator (but
+# less so with Jemalloc, fortunately) and certain workloads. Normally a server
+# restart is needed in order to lower the fragmentation, or at least to flush
+# away all the data and create it again. However thanks to this feature
+# implemented by Oran Agra for Redis 4.0 this process can happen at runtime
+# in an "hot" way, while the server is running.
+#
+# Basically when the fragmentation is over a certain level (see the
+# configuration options below) Redis will start to create new copies of the
+# values in contiguous memory regions by exploiting certain specific Jemalloc
+# features (in order to understand if an allocation is causing fragmentation
+# and to allocate it in a better place), and at the same time, will release the
+# old copies of the data. This process, repeated incrementally for all the keys
+# will cause the fragmentation to drop back to normal values.
+#
+# Important things to understand:
+#
+# 1. This feature is disabled by default, and only works if you compiled Redis
+#    to use the copy of Jemalloc we ship with the source code of Redis.
+#    This is the default with Linux builds.
+#
+# 2. You never need to enable this feature if you don't have fragmentation
+#    issues.
+#
+# 3. Once you experience fragmentation, you can enable this feature when
+#    needed with the command "CONFIG SET activedefrag yes".
+#
+# The configuration parameters are able to fine tune the behavior of the
+# defragmentation process. If you are not sure about what they mean it is
+# a good idea to leave the defaults untouched.
+
+# Enabled active defragmentation
+# activedefrag yes
+
+# Minimum amount of fragmentation waste to start active defrag
+# active-defrag-ignore-bytes 100mb
+
+# Minimum percentage of fragmentation to start active defrag
+# active-defrag-threshold-lower 10
+
+# Maximum percentage of fragmentation at which we use maximum effort
+# active-defrag-threshold-upper 100
+
+# Minimal effort for defrag in CPU percentage
+# active-defrag-cycle-min 25
+
+# Maximal effort for defrag in CPU percentage
+# active-defrag-cycle-max 75
diff --git a/meta-oe/recipes-extended/valkey/valkey/valkey.service b/meta-oe/recipes-extended/valkey/valkey/valkey.service
new file mode 100644
index 0000000000..5c6aa5b17c
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/valkey.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Valkey: an open source, in-memory data store
+After=network.target
+
+[Service]
+User=valkey
+Group=valkey
+ExecStart=/usr/bin/valkey-server /etc/valkey/valkey.conf
+ExecStop=/usr/bin/valkey-cli shutdown
+Restart=always
+LimitNOFILE=10032
+StateDirectory=valkey
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
new file mode 100644
index 0000000000..35b3d3c4a7
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey_8.1.1.bb
@@ -0,0 +1,76 @@
+SUMMARY = "Valkey key-value store"
+DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads."
+HOMEPAGE = "http://valkey.io"
+SECTION = "libs"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e"
+DEPENDS = "readline lua ncurses"
+
+SRC_URI = " \
+        git://github.com/valkey-io/valkey.git;branch=8.1;protocol=https \
+        file://valkey.conf \
+        file://init-valkey-server \
+        file://valkey.service \
+        file://hiredis-use-default-CC-if-it-is-set.patch \
+        file://lua-update-Makefile-to-use-environment-build-setting.patch \
+        file://oe-use-libc-malloc.patch \
+        file://0001-src-Do-not-reset-FINAL_LIBS.patch \
+        file://GNU_SOURCE-7.patch \
+"
+SRCREV = "fcd8bc3ee40f5d7841b7d5a8f3cd12252fec14e4"
+
+
+RPROVIDES:${PN} = "virtual-redis"
+
+inherit pkgconfig update-rc.d systemd useradd
+
+FINAL_LIBS:x86:toolchain-clang = "-latomic"
+FINAL_LIBS:riscv32:toolchain-clang = "-latomic"
+FINAL_LIBS:mips = "-latomic"
+FINAL_LIBS:arm = "-latomic"
+FINAL_LIBS:powerpc = "-latomic"
+
+export FINAL_LIBS
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN}  = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey"
+GROUPADD_PARAM:${PN} = "--system valkey"
+
+PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
+
+EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
+
+do_compile() {
+    oe_runmake -C deps hiredis lua linenoise
+    oe_runmake
+}
+
+do_install() {
+    export PREFIX=${D}/${prefix}
+    oe_runmake install
+    install -d ${D}/${sysconfdir}/valkey
+    install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server
+    install -d ${D}/var/lib/valkey/
+    chown valkey.valkey ${D}/var/lib/valkey/
+
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir}
+    sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service
+
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf
+        sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf
+    fi
+}
+
+CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf"
+
+INITSCRIPT_NAME = "valkey-server"
+INITSCRIPT_PARAMS = "defaults 87"
+
+SYSTEMD_SERVICE:${PN} = "valkey.service"
+
+CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
diff --git a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
index 455bda1d76..8f9f87b370 100644
--- a/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
+++ b/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb
@@ -9,14 +9,13 @@ SECTION = "utils"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf"
 
-SRC_URI = "${GENTOO_MIRROR}/${BP}.tar.gz \
+SRC_URI = "${GENTOO_MIRROR}/37/${BP}.tar.gz \
        file://disable_vlockrc.patch \
        file://vlock_pam_tally2_reset.patch \
        file://vlock-no_tally.patch \
        file://vlock_pam \
        "
 
-SRC_URI[md5sum] = "378175c7692a8f288e65fd4dbf8a38eb"
 SRC_URI[sha256sum] = "85aa5aed1ae49351378a0bd527a013078f0f969372a63164b1944174ae1a5e39"
 
 inherit autotools-brokensep update-alternatives
@@ -50,7 +49,7 @@ do_configure () {
 do_install:append () {
     if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ]; then
         install -d -m 0755 ${D}/${sysconfdir}/pam.d
-        install -m 0644 ${WORKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock
+        install -m 0644 ${UNPACKDIR}/vlock_pam ${D}${sysconfdir}/pam.d/vlock
     fi
 }
 
diff --git a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
index cc03ab4fea..01215a4b25 100644
--- a/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
+++ b/meta-oe/recipes-extended/volume_key/volume-key_0.3.12.bb
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://releases.pagure.org/volume_key/volume_key-${PV}.tar.xz \
 "
-SRC_URI[md5sum] = "200591290173c3ea71528411838f9080"
 SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd77309b"
 
 SRCNAME = "volume_key"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
+S = "${UNPACKDIR}/${SRCNAME}-${PV}"
 
 inherit autotools python3native python3targetconfig gettext pkgconfig
 
diff --git a/meta-oe/recipes-extended/wipe/wipe_0.24.bb b/meta-oe/recipes-extended/wipe/wipe_0.24.bb
index ad32cb0e72..ba3ed29d59 100644
--- a/meta-oe/recipes-extended/wipe/wipe_0.24.bb
+++ b/meta-oe/recipes-extended/wipe/wipe_0.24.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/berke/wipe.git;branch=master;protocol=https \
 "
 SRCREV = "796b62293e007546e051619bd03f5ba338ef28e5"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "linux"
 
diff --git a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
index 785ae50e9e..b901e8815a 100644
--- a/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
+++ b/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb
@@ -10,7 +10,6 @@ SRCREV = "493e9704dbc50f141d5fbd41c823311e79d7e8d3"
 SRC_URI = "git://github.com/thkukuk/wtmpdb.git;branch=main;protocol=https \
            file://0001-include-libgen.h-for-basename.patch"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd features_check
 
@@ -19,7 +18,7 @@ REQUIRED_DISTRO_FEATURES = "pam"
 
 SYSTEMD_SERVICE:${PN} = "wtmpdb-update-boot.service wtmpdb-rotate.service"
 
-EXTRA_OEMESON = " -Dpamlibdir=${libdir}"
+EXTRA_OEMESON = " -Dpamlibdir=${base_libdir}/security"
 
 do_install:append () {
       if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then
@@ -33,3 +32,4 @@ do_install:append () {
 FILES:${PN} += " ${systemd_system_unitdir} "
 FILES:${PN} += " ${libdir} "
 FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* "
+FILES:${PN} += " ${base_libdir}/security/*.so "
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
deleted file mode 100644
index 52f4449339..0000000000
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 72c3b7324f00047e6dc5d8380ed2f6ff2494a6f9 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 18 Dec 2022 14:51:34 -0800
-Subject: [PATCH] locale: Avoid using glibc specific defines on musl
-
-musl does not provide some glibc-only enum members e.g. _NL_ADDRESS_LANG_NAME
-
-Upstream-Status: Submitted [https://github.com/wxWidgets/wxWidgets/pull/23050]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/unix/uilocale.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/unix/uilocale.cpp b/src/unix/uilocale.cpp
-index 57773e17f5..86816ba896 100644
---- a/src/unix/uilocale.cpp
-+++ b/src/unix/uilocale.cpp
-@@ -619,7 +619,7 @@ wxString
- wxUILocaleImplUnix::GetLocalizedName(wxLocaleName name, wxLocaleForm form) const
- {
-     wxString str;
--#if defined(HAVE_LANGINFO_H) && defined(__LINUX__)
-+#if defined(HAVE_LANGINFO_H) && defined(__LINUX__) && defined(__GLIBC__)
-     switch (name)
-     {
-         case wxLOCALE_NAME_LOCALE:
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
index b3b9e79c53..a3b8d0c0ee 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch
@@ -1,4 +1,4 @@
-From a071243763f4b06fc7e71f541c49cecf380b6f27 Mon Sep 17 00:00:00 2001
+From 8f582c0ea40ccdb2d439b7614459d752f3606e15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 11 Oct 2020 22:16:55 +0200
 Subject: [PATCH] wx-config.in: Disable cross magic - it does not work for us
@@ -18,10 +18,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/wx-config.in b/wx-config.in
-index d132e3182f..d0d162e8a3 100755
+index 4df8571d28..1173d89685 100755
 --- a/wx-config.in
 +++ b/wx-config.in
-@@ -396,7 +396,7 @@ get_mask()
+@@ -394,7 +394,7 @@ get_mask()
  }
  
  # Returns true if this script is for a cross compiled config.
@@ -31,5 +31,5 @@ index d132e3182f..d0d162e8a3 100755
  
  # Determine the base directories we require.
 -- 
-2.26.2
+2.25.1
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
index ea204ed3b1..b599f38871 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0002-fix-libdir-for-multilib.patch
@@ -1,12 +1,18 @@
-wxWidgets hardcodes libdir with 'lib' and does not support multilib which will
-change it. Respect variable wxPLATFORM_LIB_DIR to support libdir be configurable.
+From 9487fe5cd271a4bee96ab590509ef38f6972887a Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] fix libdir for multilib
+
+wxWidgets hardcodes libdir with 'lib' and does not support multilib
+which will change it. Respect variable wxPLATFORM_LIB_DIR to support
+libdir be configurable.
 
 Upstream-Status: Pending
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
-Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX in this
-patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
+Rebase for wxWidgets 3.2.1. Replace wxPLATFORM_LIB_DIR with LIB_SUFFIX
+in this patch that LIB_SUFFIX has been passed to cmake in cmake.bbclass.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
@@ -17,36 +23,36 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  4 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a49ecd3883..d469471f38 100644
+index f6ae7f6210..2a13e448db 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -45,7 +45,7 @@ include(build/cmake/policies.cmake NO_POLICY_SCOPE)
  # Initialize variables for quick access to wx root dir in sub dirs
  set(wxSOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
- set(wxBINARY_DIR ${CMAKE_BINARY_DIR})
+ set(wxBINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 -set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib)
 +set(wxOUTPUT_DIR ${wxBINARY_DIR}/lib${LIB_SUFFIX})
  
  # parse the version number from wx/version.h and include in wxMAJOR_VERSION and wxMINOR_VERSION
  file(READ "${wxSOURCE_DIR}/include/wx/version.h" WX_VERSION_H_CONTENTS)
 diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index b359560bc0..c59ea60923 100644
+index addd8d6b81..9ec677534b 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
-@@ -76,7 +76,7 @@ function(wx_write_config_inplace)
+@@ -100,7 +100,7 @@ function(wx_write_config_inplace)
      execute_process(
          COMMAND
          "${CMAKE_COMMAND}" -E ${COPY_CMD}
--        "${CMAKE_CURRENT_BINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
-+        "${CMAKE_CURRENT_BINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
-         "${CMAKE_CURRENT_BINARY_DIR}/wx-config"
+-        "${wxBINARY_DIR}/lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
++        "${wxBINARY_DIR}/lib${LIB_SUFFIX}/wx/config/inplace-${TOOLCHAIN_FULLNAME}"
+         "${wxBINARY_DIR}/wx-config"
          )
  endfunction()
 diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index 7182364e5e..55fbebc7ee 100644
+index 72a34f0b4f..81ede7d8ae 100644
 --- a/build/cmake/functions.cmake
 +++ b/build/cmake/functions.cmake
-@@ -435,8 +435,8 @@ macro(wx_add_library name)
+@@ -462,8 +462,8 @@ macro(wx_add_library name)
          endif()
          wx_install(TARGETS ${name}
              EXPORT wxWidgetsTargets
@@ -105,3 +111,6 @@ index 384c6837b8..d3303faabb 100644
  )
  
  # uninstall target
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
index 6eef0b6790..dbede0304f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/create-links-with-relative-path.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0003-create-links-with-relative-path.patch
@@ -1,18 +1,23 @@
+From b86806ef34d4c9171165c1533064bf34ad822e20 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] create links with relative path
+
 It fails to build python3-wxgtk4 which depends on wxwidgets:
 
 | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
     absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux
-        /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
-        /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
+    /wxwidgets-native/3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work
+    /x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wx-config
     pointing at /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native/3.2.1-r0
-        /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
+    /recipe-sysroot-native/usr/lib/wx/config/gtk3-unicode-3.2.
   Please replace this with a relative link.
 | ERROR: wxwidgets-native-3.2.1-r0 do_populate_sysroot: sstate found an
     absolute path symlink /path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
-        /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
-        /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
-        /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
-  Please replace this with a relative link.
+    /3.2.1-r0/sysroot-destdir/path/to/build/tmp-glibc/work/x86_64-linux/wxwidgets-native
+    /3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc pointing at /path/to/build/tmp-glibc
+    /work/x86_64-linux/wxwidgets-native/3.2.1-r0/recipe-sysroot-native/usr/bin/wxrc-3.2.
+   Please replace this with a relative link.
 
 Create symlink with relative path to fix the issues.
 
@@ -50,3 +55,6 @@ index dbed8cc9b3..1dbc3261d3 100644
              \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
              )"
          )
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
index 6329256b0c..e3463ba170 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/not-append-system-name-to-lib-name.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0004-don-not-append-system-name-to-lib-name.patch
@@ -1,3 +1,8 @@
+From 5e9725c1151e2b029066d61ef5dccf1f3e6cb323 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] don not append system name to lib name
+
 It appends system name to library names for cross compile. For example, the
 library name is libwx_baseu-3.1-Linux.so rather than libwx_baseu-3.1.so. It is
 not appropriate for oe.
@@ -14,10 +19,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
-index e374d9a273..c6b1908bd6 100644
+index 81ede7d8ae..23eebeb914 100644
 --- a/build/cmake/functions.cmake
 +++ b/build/cmake/functions.cmake
-@@ -219,9 +219,9 @@ function(wx_set_target_properties target_name)
+@@ -243,9 +243,9 @@ function(wx_set_target_properties target_name)
      endif()
  
      set(cross_target)
@@ -30,3 +35,6 @@ index e374d9a273..c6b1908bd6 100644
  
      set(lib_prefix "lib")
      if(MSVC OR (WIN32 AND wxBUILD_SHARED))
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
index 628f8dee56..b650c50386 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0005-wx-config-fix-libdir-for-multilib.patch
@@ -1,8 +1,14 @@
-It sets 'libdir' with path element 'lib' directly which is not suitable for
-multilib. Add an option '--baselib' for wx-config to support multilib when
-cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}".
+From 4230cd84f156f9eb5c9b80ffbc69dd55fa7c7ca7 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Sat, 12 Oct 2024 18:43:25 +0800
+Subject: [PATCH] wx-config: fix libdir for multilib
 
-Upstream-Status: Pending [oe specific]
+It sets 'libdir' with path element 'lib' directly which is not suitable
+for multilib. Add an option '--baselib' for wx-config to support
+multilib when cross compile. And set default value of baselib with
+"lib${wxPLATFORM_LIB_DIR}".
+
+Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
@@ -15,10 +21,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake
-index 52ae69d3f6..28aa733eb0 100644
+index 9ec677534b..ee61cf7572 100644
 --- a/build/cmake/config.cmake
 +++ b/build/cmake/config.cmake
-@@ -86,7 +86,7 @@ function(wx_write_config)
+@@ -110,7 +110,7 @@ function(wx_write_config)
      set(prefix ${CMAKE_INSTALL_PREFIX})
      set(exec_prefix "\${prefix}")
      set(includedir "\${prefix}/include")
@@ -26,9 +32,9 @@ index 52ae69d3f6..28aa733eb0 100644
 +    set(libdir "\${exec_prefix}/\${baselib}")
      set(bindir "\${exec_prefix}/bin")
  
-     find_program(EGREP egrep)
+     if(wxBUILD_MONOLITHIC)
 diff --git a/wx-config.in b/wx-config.in
-index e3f7d115bb..0e78af03c7 100755
+index 1173d89685..8364a33e9d 100755
 --- a/wx-config.in
 +++ b/wx-config.in
 @@ -42,7 +42,8 @@ usage()
@@ -41,7 +47,7 @@ index e3f7d115bb..0e78af03c7 100755
             [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
             [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]]
             [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR]
-@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix
+@@ -133,7 +134,7 @@ wxconfig_output_options="prefix exec_prefix
  
  # Options that permit the user to supply hints that may affect the output.
  # These options all accept arbitrary values, to interpret as they please.
@@ -50,7 +56,7 @@ index e3f7d115bb..0e78af03c7 100755
  
  # Input options that accept only a yes or no argument.
  #
-@@ -404,6 +405,7 @@ is_cross()  { [ "x@cross_compiling@" = "xyes" ]; }
+@@ -400,6 +401,7 @@ is_cross()  { [ "xno" = "xyes" ]; }
  # Determine the base directories we require.
  prefix=${input_option_prefix-${this_prefix:-@prefix@}}
  exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}}
@@ -58,3 +64,6 @@ index e3f7d115bb..0e78af03c7 100755
  wxconfdir="@libdir@/wx/config"
  
  installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"`
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
index e4ca6579f8..37d61dcb3f 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/musl-locale-l.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0006-Fix-locale-on-musl.patch
@@ -1,8 +1,19 @@
-Upstream-Status: Pending
+From 64d5d7f68cde208c6f8a5e0b71da93f98e4720f7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 12 Oct 2024 20:30:16 +0800
+Subject: [PATCH] Fix locale on musl
 
 these macro'd away functions don't exist in musl (yet)
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/wx/xlocale.h | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
 diff --git a/include/wx/xlocale.h b/include/wx/xlocale.h
-index c433d25..3ab9d84 100644
+index c433d25d05..794cf0b66b 100644
 --- a/include/wx/xlocale.h
 +++ b/include/wx/xlocale.h
 @@ -33,6 +33,26 @@
@@ -32,3 +43,6 @@ index c433d25..3ab9d84 100644
  // The platform-specific locale type
  // If wxXLocale_t is not defined, then only "C" locale support is provided
  #ifdef wxHAS_XLOCALE_SUPPORT
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
index 5160f2e1fe..ef94e3551b 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets/0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets/0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch
@@ -1,4 +1,4 @@
-From e108aff9d6dae613f486c1b1681f4a3cdf17b845 Mon Sep 17 00:00:00 2001
+From 22f70d5bd039b20bfdad522341412ca001c639db Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 19 Dec 2022 15:07:55 -0800
 Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
@@ -6,16 +6,17 @@ Subject: [PATCH] Set HAVE_LARGEFILE_SUPPORT to 1 explicitly
 nothing sets this to 0, but for some reason it gets undef'd
 
 Upstream-Status: Pending
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  build/cmake/setup.h.in | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in
-index bce33a73f3..22afb4cfa0 100644
+index fcc282980d..767adbf658 100644
 --- a/build/cmake/setup.h.in
 +++ b/build/cmake/setup.h.in
-@@ -869,8 +869,7 @@
+@@ -867,8 +867,7 @@
  /*
   * Define if large (64 bit file offsets) files are supported.
   */
@@ -26,5 +27,5 @@ index bce33a73f3..22afb4cfa0 100644
   * Use OpenGL
   */
 -- 
-2.39.0
+2.25.1
 
diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
index 91653e2852..2cd154cab6 100644
--- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb
+++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.6.bb
@@ -20,16 +20,16 @@ DEPENDS += " \
 
 SRC_URI = "gitsm://github.com/wxWidgets/wxWidgets.git;branch=3.2;protocol=https \
            file://0001-wx-config.in-Disable-cross-magic-it-does-not-work-fo.patch \
-           file://fix-libdir-for-multilib.patch \
-           file://create-links-with-relative-path.patch \
-           file://not-append-system-name-to-lib-name.patch \
-           file://wx-config-fix-libdir-for-multilib.patch \
-           file://0001-locale-Avoid-using-glibc-specific-defines-on-musl.patch \
-           file://musl-locale-l.patch \
-           file://0001-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
+           file://0002-fix-libdir-for-multilib.patch \
+           file://0003-create-links-with-relative-path.patch \
+           file://0004-don-not-append-system-name-to-lib-name.patch \
+           file://0005-wx-config-fix-libdir-for-multilib.patch \
+           file://0006-Fix-locale-on-musl.patch \
+           file://0007-Set-HAVE_LARGEFILE_SUPPORT-to-1-explicitly.patch \
            "
-SRCREV= "97e99707c5d2271a70cb686720b48dbf34ced496"
-S = "${WORKDIR}/git"
+SRCREV = "5ff25322553c1870cf20a2e1ba6f20ed50d9fe9a"
+
+UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 # These can be either 'builtin' or 'sys' and builtin means cloned soures are
 # build. So these cannot be PACKAGECONFIGs and let's use libs where we can (see
@@ -73,7 +73,7 @@ PACKAGECONFIG[libsecret] = "-DwxUSE_SECRETSTORE=ON,-DwxUSE_SECRETSTORE=OFF,libse
 PACKAGECONFIG[lzma] = "-DwxUSE_LIBLZMA=ON,-DwxUSE_LIBLZMA=OFF,xz"
 PACKAGECONFIG[mspack] = "-DwxUSE_LIBMSPACK=ON,-DwxUSE_LIBMSPACK=OFF,libmspack"
 PACKAGECONFIG[opengl] = "-DwxUSE_OPENGL=ON,-DwxUSE_OPENGL=OFF,libglu"
-PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,libsdl2"
+PACKAGECONFIG[sdl_audio] = "-DwxUSE_LIBSDL=ON,-DwxUSE_LIBSDL=OFF,virtual/libsdl2"
 PACKAGECONFIG[webkit] = "-DwxUSE_WEBVIEW_WEBKIT=ON,-DwxUSE_WEBVIEW_WEBKIT=OFF,webkitgtk3,,,no_gui"
 PACKAGECONFIG[curl] = "-DwxUSE_WEBREQUEST_CURL=ON,-DwxUSE_WEBREQUEST_CURL=OFF,curl"
 
diff --git a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
index b75802f09f..f450c2cf01 100644
--- a/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
+++ b/meta-oe/recipes-extended/zlog/zlog_1.2.16.bb
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRCREV = "dc2c284664757fce6ef8f96f8b3ab667a53ef489"
 SRC_URI = "git://github.com/HardySimpson/zlog;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb
index b4b3a27b2b..2c894c0230 100644
--- a/meta-oe/recipes-extended/zram/zram_0.2.bb
+++ b/meta-oe/recipes-extended/zram/zram_0.2.bb
@@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 inherit update-rc.d systemd
 
-RDEPENDS:${PN} = "kmod \
-    ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux','util-linux-swaponoff',d)}"
+RDEPENDS:${PN} = "kmod util-linux-swaponoff \
+    ${@bb.utils.contains('DISTRO_FEATURES','systemd','util-linux-zramctl','',d)}"
 RRECOMMENDS:${PN} = "kernel-module-zram"
 
 
@@ -17,21 +17,23 @@ SRC_URI = " \
            file://dev-zram0.swap \
 "
 
+S = "${UNPACKDIR}"
+
 do_install () {
     # Install systemd related configuration file
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/zram
+        install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/zram
     fi
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -d ${D}${libexecdir}
-        install -m 0755 ${WORKDIR}/zram-swap-init ${D}${libexecdir}
-        install -m 0755 ${WORKDIR}/zram-swap-deinit ${D}${libexecdir}
+        install -m 0755 ${UNPACKDIR}/zram-swap-init ${D}${libexecdir}
+        install -m 0755 ${UNPACKDIR}/zram-swap-deinit ${D}${libexecdir}
         install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service
+        install -m 0644 ${UNPACKDIR}/zram-swap.service ${D}${systemd_unitdir}/system/zram-swap.service
         sed -i -e "s,@LIBEXECDIR@,${libexecdir},g" ${D}${systemd_unitdir}/system/zram-swap.service
-        install -m 0644 ${WORKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap
+        install -m 0644 ${UNPACKDIR}/dev-zram0.swap ${D}${systemd_unitdir}/system/dev-zram0.swap
     fi
 }
 
diff --git a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
index 1bc4010f8a..5227b834f9 100644
--- a/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
+++ b/meta-oe/recipes-extended/zsync/zsync-curl_git.bb
@@ -12,9 +12,17 @@ SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f"
 
 PV = "0.6.2+git"
 
+# Upstream repo does not tag
+UPSTREAM_CHECK_COMMITS = "1"
+
 inherit autotools
 
-S = "${WORKDIR}/git"
 AUTOTOOLS_SCRIPT_PATH = "${S}/src"
 
 BBCLASSEXTEND = "native nativesdk"
+
+# http://errors.yoctoproject.org/Errors/Details/766891/
+# git/src/libzsync/zsync.c:445:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types]
+# git/src/libzsync/zsync.c:450:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types]
+# git/src/libzsync/zsync.c:932:43: error: passing argument 4 of 'zsync_configure_zstream_for_zdata' from incompatible pointer type [-Wincompatible-pointer-types]
+CFLAGS += "-Wno-error=incompatible-pointer-types"