47 files changed, 352 insertions, 1441 deletions
diff --git a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb
index 88fe9cf39c..e4be41f5f3 100644
--- a/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb
+++ b/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.5.2.bb
@@ -19,6 +19,11 @@ PE = "1"
 DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"
+# libcamera has logic to detect libc++ in sysroot with clang and uses it if it exists
+# however this does not work well, when llvm runtime is not used systemd wide. Because dependencies
+# e.g. libpisp demand libstdc++ and mix and match does not work well
+BASE_DEFAULT_DEPS:remove = "${@bb.utils.contains("TC_CXX_RUNTIME", "gnu", "compiler-rt libcxx", "", d)}"
 PACKAGES =+ "${PN}-gst ${PN}-pycamera"
 PACKAGECONFIG ??= ""
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch
index 038615538d..af33d5444c 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-Fix-build-with-gcc-15.patch
@@ -1,4 +1,4 @@
-From 4f7a50fa0b9ecc177a54e84eca3c98207cb623ac Mon Sep 17 00:00:00 2001
+From c84f185f29d0839b97177aecb0a78b9717947973 Mon Sep 17 00:00:00 2001
 From: Nguyen Dat Tho <tho3.nguyen@lge.com>
 Date: Wed, 9 Apr 2025 13:05:24 +0900
 Subject: [PATCH] Fix build with gcc-15
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch
deleted file mode 100644
index 2b75f29088..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-Use-secure_getenv-on-Linux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d4d517fe8924696584e84b953ab22f496b371be Mon Sep 17 00:00:00 2001
-From: Alex Kiernan <alex.kiernan@gmail.com>
-Date: Tue, 27 May 2025 13:33:30 +0100
-Subject: [PATCH] Use secure_getenv on Linux
-Upstream-Status: Inactive-Upstream [Upstream does not take patches]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
- mDNSShared/dnssd_clientstub.c | 4 ++++
- 1 file changed, 4 insertions(+)
-diff --git a/mDNSShared/dnssd_clientstub.c b/mDNSShared/dnssd_clientstub.c
-index 6667276ee33a..e7b51813664e 100644
--- a/mDNSShared/dnssd_clientstub.c
-+++ b/mDNSShared/dnssd_clientstub.c
-@@ -801,10 +801,14 @@ static DNSServiceErrorType ConnectToServer(DNSServiceRef *ref, DNSServiceFlags f
-         #endif
-         #ifndef USE_TCP_LOOPBACK
-         char* uds_serverpath = NULL;
-+#ifdef TARGET_OS_LINUX
-+        uds_serverpath = secure_getenv(MDNS_UDS_SERVERPATH_ENVVAR);
-+#else
-         if (!issetugid())
-         {
-             uds_serverpath = getenv(MDNS_UDS_SERVERPATH_ENVVAR);
-         }
-+#endif
-         if (uds_serverpath == NULL)
-             uds_serverpath = MDNS_UDS_SERVERPATH;
-         else if (strlen(uds_serverpath) >= MAX_CTLPATH)
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
index 94b2ce8ab2..5464e3febe 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0001-dns-sd-Include-missing-headers.patch
@@ -1,11 +1,11 @@
-From 2e18dbd9c8ff3e48270fde2ba46b44e94ebdb439 Mon Sep 17 00:00:00 2001
+From cdbc28c668dd627906f833f9a8e32ac53b0b0139 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 4 Nov 2021 07:31:32 -0700
 Subject: [PATCH] dns-sd: Include missing headers
 Fixes build on Musl
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
 mDNSPosix/nss_mdns.c | 3 +++
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
index 48f18f1f03..f547c64d93 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0002-make-Set-libdns_sd.so-soname-correctly.patch
@@ -1,9 +1,9 @@
-From aedffca94035f7a16303fb4f90cba19c0df1ca2e Mon Sep 17 00:00:00 2001
+From dcc1f39a0918cdebf53ac7c105b3d33df960ed14 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Mon, 5 Dec 2022 15:14:12 +0000
 Subject: [PATCH] make: Set libdns_sd.so soname correctly
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
 Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
 ---
 mDNSPosix/Makefile | 2 +-
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
index b07720b35e..2969b5e244 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0004-make-Separate-TLS-targets-from-libraries.patch
@@ -1,4 +1,4 @@
-From 74f0969c4f092d92c4fc6440c27707c2a5cbfe97 Mon Sep 17 00:00:00 2001
+From f7ee12c1f8e85b9d2fe4023b6539c8051dc710c3 Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Mon, 5 Dec 2022 15:14:26 +0000
 Subject: [PATCH] make: Separate TLS targets from libraries
@@ -6,7 +6,7 @@ Subject: [PATCH] make: Separate TLS targets from libraries
 There are dependencies on TLSOBJS, which fails when `-lmbedtls` is
 listed as a dependency, so separate it out.
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
 Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
 ---
 mDNSPosix/Makefile | 14 ++++++++------
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
index 42d0e51c54..0c1a9f373f 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0005-mDNSCore-Fix-broken-debug-parameter.patch
@@ -1,22 +1,22 @@
-From 224884989226b9d7980c0f09d895c3e0dc48c47a Mon Sep 17 00:00:00 2001
+From e79f75487e32f87677519ec40c021b1623395bde Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Mon, 5 Dec 2022 22:49:49 +0000
 Subject: [PATCH] mDNSCore: Fix broken debug parameter
-Upstream-Status: Pending
+Upstream-Status: Inactive-Upstream [Upstream does not take patches]
 Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
 ---
 mDNSCore/mDNS.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/mDNSCore/mDNS.c b/mDNSCore/mDNS.c
+Index: mDNSResponder/mDNSCore/mDNS.c
-index 2a6f9d5b28f3..2bdd78e351d9 100644
+===================================================================
--- a/mDNSCore/mDNS.c
+--- mDNSResponder.orig/mDNSCore/mDNS.c
-+++ b/mDNSCore/mDNS.c
+++ mDNSResponder/mDNSCore/mDNS.c
-@@ -11046,7 +11046,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastAnswers(mDNS *const m, const DNSMessage *
+@@ -9481,7 +9481,7 @@ mDNSlocal void mDNSCoreReceiveNoUnicastA
- #else
+                         {
+                             CacheRecord *negcr;
                             const DNSServRef dnsserv = qptr->qDNSServer;
- #endif
 -                            debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName, DNSTypeName(q.qtype));
 +                            debugf("mDNSCoreReceiveNoUnicastAnswers making negative cache entry TTL %d for %##s (%s)", negttl, currentQName->c, DNSTypeName(q.qtype));
                             // Create a negative record for the current name in the CNAME chain.
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
index 01afa6fea5..5f8f428302 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
+++ b/meta-networking/recipes-protocols/mdns/mdns/0006-make-Add-top-level-Makefile.patch
@@ -1,4 +1,4 @@
-From 41819656682c8ab68d1181a5ee39634df7630de3 Mon Sep 17 00:00:00 2001
+From a1c982808ebfb71ba7e0f16040013b7127a6e2ab Mon Sep 17 00:00:00 2001
 From: Alex Kiernan <alex.kiernan@gmail.com>
 Date: Tue, 6 Dec 2022 13:28:31 +0000
 Subject: [PATCH] make: Add top-level Makefile
@@ -8,19 +8,15 @@ Simple top level Makefile that just delegates to mDNSPosix.
 Upstream-Status: Inappropriate [oe-specific]
 Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
 ---
- Makefile | 6 ++++++
+ Makefile | 2 ++
- 1 file changed, 6 insertions(+)
+ 1 file changed, 2 insertions(+)
 create mode 100644 Makefile
 diff --git a/Makefile b/Makefile
 new file mode 100644
-index 000000000000..2fe39ad8938a
+index 000000000000..feb6ac67ef47
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,2 @@
-+# We install a stub Makefile in the top directory so that the various checks
-+# in base.bbclass pass their tests for a Makefile, this ensures (that amongst
-+# other things) the sstate checks will clean the build directory when the
-+# task hashes changes.
 +all clean:
 +       cd mDNSPosix && $(MAKE) $@
diff --git a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch b/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
deleted file mode 100644
index ebebeb27f0..0000000000
--- a/meta-networking/recipes-protocols/mdns/mdns/0009-remove-unneeded-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 43b82963a79250b19c94e15d0a86b04a5cffc0e1 Mon Sep 17 00:00:00 2001
-From: Beniamin Sandu <beniaminsandu@gmail.com>
-Date: Thu, 15 Jun 2023 17:02:58 +0000
-Subject: [PATCH] remove unneeded headers
-From a quick look, these seem to not be needed and having them
-breaks the build with mbedtls 3.x. Without them it builds fine
-on both 2.x and 3.x versions.
-Upstream-Status: Inactive-Upstream [Upstream does not take patches]
-Signed-off-by: Beniamin Sandu <beniaminsandu@gmail.com>
---
- mDNSPosix/mbedtls.c | 2 --
- 1 file changed, 2 deletions(-)
-diff --git a/mDNSPosix/mbedtls.c b/mDNSPosix/mbedtls.c
-index a73681b6d528..ab8f8c772c00 100644
--- a/mDNSPosix/mbedtls.c
-+++ b/mDNSPosix/mbedtls.c
-@@ -38,10 +38,8 @@
- #include <mbedtls/sha256.h>
- #include <mbedtls/base64.h>
- 
-#include <mbedtls/certs.h>
- #include <mbedtls/x509.h>
- #include <mbedtls/ssl.h>
-#include <mbedtls/config.h>
- 
- // Posix TLS server context
- struct TLSContext_struct {
diff --git a/meta-networking/recipes-protocols/mdns/mdns/mdns.service b/meta-networking/recipes-protocols/mdns/mdns/mdns.service
index 531d142dcd..86869d4792 100644
--- a/meta-networking/recipes-protocols/mdns/mdns/mdns.service
+++ b/meta-networking/recipes-protocols/mdns/mdns/mdns.service
@@ -3,11 +3,8 @@ Description=Zero-configuration networking
 After=network.target
 [Service]
-Type=forking
+Type=exec
-ExecStartPre=/bin/rm -f /var/run/mdnsd.pid
+ExecStart=/usr/sbin/mdnsd -foreground
-ExecStart=/usr/sbin/mdnsd
-ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/var/run/mdnsd.pid
 Restart=always
 RestartSec=10s
diff --git a/meta-networking/recipes-protocols/mdns/mdns_2600.140.3.bb b/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb
index d7f2335747..d44eb72f67 100644
--- a/meta-networking/recipes-protocols/mdns/mdns_2600.140.3.bb
+++ b/meta-networking/recipes-protocols/mdns/mdns_2881.0.25.bb
@@ -12,13 +12,11 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https
           file://0004-make-Separate-TLS-targets-from-libraries.patch \
           file://0005-mDNSCore-Fix-broken-debug-parameter.patch \
           file://0006-make-Add-top-level-Makefile.patch \
-           file://0009-remove-unneeded-headers.patch \
           file://0001-Fix-build-with-gcc-15.patch \
-           file://0001-Use-secure_getenv-on-Linux.patch \
           file://mdns.service \
           "
-BRANCH = "rel/mDNSResponder-2600"
+BRANCH = "main"
-SRCREV = "62914d23f299cf336a8647fb3a1b5b78647b3b41"
+SRCREV = "d4658af3f5f291311c6aee4210aa6d39bda82bbe"
 inherit github-releases manpages systemd update-rc.d
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json
deleted file mode 100644
index e36a2165d1..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/bacnet.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "general": {
-      "objectName": "TB_gateway",
-      "address": "192.168.188.181:1052",
-      "objectIdentifier": 599,
-      "maxApduLengthAccepted": 1024,
-      "segmentationSupported": "segmentedBoth",
-      "vendorIdentifier": 15
-    },
-    "devices": [
-      {
-        "deviceName": "BACnet Device ${objectName}",
-        "deviceType": "default",
-        "address": "192.168.188.181:10520",
-        "pollPeriod": 10000,
-        "attributes": [
-          {
-            "key": "temperature",
-            "type": "string",
-            "objectId": "analogOutput:1",
-            "propertyId": "presentValue"
-          }
-        ],
-        "timeseries": [
-          {
-            "key": "state",
-            "type": "bool",
-            "objectId": "binaryValue:1",
-            "propertyId": "presentValue"
-          }
-        ],
-        "attributeUpdates": [
-          {
-            "key": "brightness",
-            "requestType": "writeProperty",
-            "objectId": "analogOutput:1",
-            "propertyId": "presentValue"
-          }
-        ],
-        "serverSideRpc": [
-          {
-            "method": "set_state",
-            "requestType": "writeProperty",
-            "requestTimeout": 10000,
-            "objectId": "binaryOutput:1",
-            "propertyId": "presentValue"
-          },
-          {
-            "method": "get_state",
-            "requestType": "readProperty",
-            "requestTimeout": 10000,
-            "objectId": "binaryOutput:1",
-            "propertyId": "presentValue"
-          }
-        ]
-      }
-    ]
-  }
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json
deleted file mode 100755
index 2a5da3f41d..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/ble.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "name": "BLE Connector",
-    "rescanIntervalSeconds": 100,
-    "checkIntervalSeconds": 100,
-    "scanTimeSeconds": 5,
-    "passiveScanMode": true,
-    "devices": [
-        {
-            "name": "Temperature and humidity sensor",
-            "MACAddress": "4C:65:A8:DF:85:C0",
-            "addrType": "public",
-            "telemetry": [
-                {
-                    "key": "temperature",
-                    "method": "notify",
-                    "characteristicUUID": "226CAA55-6476-4566-7562-66734470666D",
-                    "byteFrom": 2,
-                    "byteTo": 6
-                },
-                {
-                    "key": "humidity",
-                    "method": "notify",
-                    "characteristicUUID": "226CAA55-6476-4566-7562-66734470666D",
-                    "byteFrom": 9,
-                    "byteTo": 13
-                }
-            ],
-            "attributes": [
-                {
-                    "key": "name",
-                    "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB",
-                    "method": "read",
-                    "byteFrom": 0,
-                    "byteTo": -1
-                }
-            ],
-            "attributeUpdates": [
-                {
-                    "attributeOnThingsBoard": "sharedName",
-                    "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB"
-                }
-            ],
-            "serverSideRpc": [
-                {
-                    "methodRPC": "rpcMethod1",
-                    "withResponse": true,
-                    "characteristicUUID": "00002A00-0000-1000-8000-00805F9B34FB",
-                    "methodProcessing": "read"
-                }
-            ]
-        }
-    ]
-}
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json
deleted file mode 100644
index b5cec0045a..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/can.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    "interface": "socketcan",
-    "channel": "vcan0",
-    "backend": {
-      "fd": true
-    },
-    "reconnectPeriod": 5,
-    "devices": [
-      {
-        "name": "Car",
-        "sendDataOnlyOnChange": false,
-        "enableUnknownRpc": true,
-        "strictEval": false,
-        "attributes": [
-          {
-            "key": "isDriverDoorOpened",
-            "nodeId": 41,
-            "command": "2:2:big:8717",
-            "value": "4:1:int",
-            "expression": "bool(value & 0b00000100)",
-            "polling": {
-              "type": "once",
-              "dataInHex": "AB CD AB CD"
-            }
-          }
-        ],
-        "timeseries": [
-          {
-            "key": "rpm",
-            "nodeId": 1918,
-            "isExtendedId": true,
-            "command": "2:2:big:48059",
-            "value": "4:2:big:int",
-            "expression": "value / 4",
-            "polling": {
-              "type": "always",
-              "period": 5,
-              "dataInHex": "aaaa bbbb aaaa bbbb"
-            }
-          },
-          {
-            "key": "milliage",
-            "nodeId": 1918,
-            "isExtendedId": true,
-            "value": "4:2:little:int",
-            "expression": "value * 10",
-            "polling": {
-              "type": "always",
-              "period": 30,
-              "dataInHex": "aa bb cc dd ee ff aa bb"
-            }
-          }
-        ],
-        "attributeUpdates": [
-          {
-            "attributeOnThingsBoard": "softwareVersion",
-            "nodeId": 64,
-            "isExtendedId": true,
-            "dataLength": 4,
-            "dataExpression": "value + 5",
-            "dataByteorder": "little"
-          }
-        ],
-        "serverSideRpc": [
-          {
-            "method": "sendSameData",
-            "nodeId": 4,
-            "isExtendedId": true,
-            "isFd": true,
-            "bitrateSwitch": true,
-            "dataInHex": "aa bb cc dd ee ff    aa bb aa bb cc d ee ff"
-          },
-          {
-            "method": "setLightLevel",
-            "nodeId": 5,
-            "dataLength": 2,
-            "dataByteorder": "little",
-            "dataBefore": "00AA"
-          },
-          {
-            "method": "setSpeed",
-            "nodeId": 16,
-            "dataAfter": "0102",
-            "dataExpression": "userSpeed if maxAllowedSpeed > userSpeed else maxAllowedSpeed"
-          }
-        ]
-      }
-    ]
-  }
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json
deleted file mode 100755
index 0aee5cb765..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/custom_serial.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "name": "Custom serial connector",
-  "devices": [
-    {
-      "name": "CustomSerialDevice1",
-      "type": "default",
-      "port": "/dev/ttyUSB0",
-      "baudrate": 9600,
-      "converter": "CustomSerialUplinkConverter",
-      "telemetry": [
-        {
-          "type": "byte",
-          "key": "humidity",
-          "untilDelimiter": "\r"
-        }
-      ],
-      "attributes":[
-        {
-          "key": "SerialNumber",
-          "type": "string",
-          "fromByte": 4,
-          "toByte": -1
-        }
-      ],
-      "attributeUpdates": [
-        {
-          "attributeOnThingsBoard": "attr1",
-          "stringToDevice": "value = ${attr1}\n"
-        }
-      ]
-    }
-  ]
-}
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf
deleted file mode 100755
index d66c2b84a8..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/logs.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-[loggers]
-keys=root, service, connector, converter, tb_connection, storage, extension
-[handlers]
-keys=consoleHandler, serviceHandler, connectorHandler, converterHandler, tb_connectionHandler, storageHandler, extensionHandler
-[formatters]
-keys=LogFormatter
-[logger_root]
-level=ERROR
-handlers=consoleHandler
-[logger_connector]
-level=INFO
-handlers=connectorHandler
-formatter=LogFormatter
-qualname=connector
-[logger_storage]
-level=INFO
-handlers=storageHandler
-formatter=LogFormatter
-qualname=storage
-[logger_tb_connection]
-level=INFO
-handlers=tb_connectionHandler
-formatter=LogFormatter
-qualname=tb_connection
-[logger_service]
-level=INFO
-handlers=serviceHandler
-formatter=LogFormatter
-qualname=service
-[logger_converter]
-level=INFO
-handlers=converterHandler
-formatter=LogFormatter
-qualname=converter
-[logger_extension]
-level=INFO
-handlers=connectorHandler
-formatter=LogFormatter
-qualname=extension
-[handler_consoleHandler]
-class=StreamHandler
-level=INFO
-formatter=LogFormatter
-args=(sys.stdout,)
-[handler_connectorHandler]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=LogFormatter
-args=("./logs/connector.log", "d", 1, 7,)
-[handler_storageHandler]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=LogFormatter
-args=("./logs/storage.log", "d", 1, 7,)
-[handler_serviceHandler]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=LogFormatter
-args=("./logs/service.log", "d", 1, 7,)
-[handler_converterHandler]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=LogFormatter
-args=("./logs/converter.log", "d", 1, 3,)
-[handler_extensionHandler]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=LogFormatter
-args=("./logs/extension.log", "d", 1, 3,)
-[handler_tb_connectionHandler]
-level=INFO
-class=logging.handlers.TimedRotatingFileHandler
-formatter=LogFormatter
-args=("./logs/tb_connection.log", "d", 1, 3,)
-[formatter_LogFormatter]
-format="%(asctime)s - %(levelname)s - [%(filename)s] - %(module)s - %(lineno)d - %(message)s"
-datefmt="%Y-%m-%d %H:%M:%S"
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json
deleted file mode 100755
index 479d8aa4d0..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus.json
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-  "server": {
-    "type": "tcp",
-    "host": "127.0.0.1",
-    "port": 5020,
-    "timeout": 35,
-    "method": "socket",
-    "byteOrder": "BIG",
-    "devices": [
-      {
-        "unitId": 1,
-        "deviceName": "Temp Sensor",
-        "attributesPollPeriod": 5000,
-        "timeseriesPollPeriod": 5000,
-        "sendDataOnlyOnChange": true,
-        "attributes": [
-          {
-            "tag": "string_read",
-            "type": "string",
-            "functionCode": 4,
-            "objectsCount": 4,
-            "address": 1
-          },
-          {
-            "tag": "bits_read",
-            "type": "bits",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 5
-          },
-          {
-            "tag": "8int_read",
-            "type": "8int",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 6
-          },
-          {
-            "tag": "16int_read",
-            "type": "16int",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 7
-          },
-          {
-            "tag": "32int_read_divider",
-            "type": "32int",
-            "functionCode": 4,
-            "objectsCount": 2,
-            "address": 8,
-            "divider": 10
-          },
-          {
-            "tag": "8int_read_multiplier",
-            "type": "8int",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 10,
-            "multiplier": 10
-          },
-          {
-            "tag": "32int_read",
-            "type": "32int",
-            "functionCode": 4,
-            "objectsCount": 2,
-            "address": 11
-          },
-          {
-            "tag": "64int_read",
-            "type": "64int",
-            "functionCode": 4,
-            "objectsCount": 4,
-            "address": 13
-          }
-      ],
-      "timeseries": [
-          {
-            "tag": "8uint_read",
-            "type": "8uint",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 17
-          },
-          {
-            "tag": "16uint_read",
-            "type": "16uint",
-            "functionCode": 4,
-            "objectsCount": 2,
-            "address": 18
-          },
-          {
-            "tag": "32uint_read",
-            "type": "32uint",
-            "functionCode": 4,
-            "objectsCount": 4,
-            "address": 20
-          },
-          {
-            "tag": "64uint_read",
-            "type": "64uint",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 24
-          },
-          {
-            "tag": "16float_read",
-            "type": "16float",
-            "functionCode": 4,
-            "objectsCount": 1,
-            "address": 25
-          },
-          {
-            "tag": "32float_read",
-            "type": "32float",
-            "functionCode": 4,
-            "objectsCount": 2,
-            "address": 26
-          },
-          {
-            "tag": "64float_read",
-            "type": "64float",
-            "functionCode": 4,
-            "objectsCount": 4,
-            "address": 28
-          }
-        ],
-        "attributeUpdates": [
-          {
-            "tag": "shared_attribute_write",
-            "type": "32int",
-            "functionCode": 6,
-            "objectsCount": 2,
-            "address": 29
-          }
-        ],
-        "rpc": [
-          {
-            "tag": "setValue",
-            "type": "bits",
-            "functionCode": 5,
-            "objectsCount": 1,
-            "address": 31
-          },
-          {
-            "tag": "getValue",
-            "type": "bits",
-            "functionCode": 1,
-            "objectsCount": 1,
-            "address": 31
-          },
-          {
-            "tag": "setCPUFanSpeed",
-            "type": "32int",
-            "functionCode": 16,
-            "objectsCount": 2,
-            "address": 33
-          },
-          {
-            "tag":"getCPULoad",
-            "type": "32int",
-            "functionCode": 4,
-            "objectsCount": 2,
-            "address": 35
-          }
-        ]
-      }
-    ]
-  }
-}
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json
deleted file mode 100755
index 19b38e3f7b..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/modbus_serial.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "server": {
-    "name": "Modbus Default Server",
-    "type": "serial",
-    "method": "rtu",
-    "port": "/dev/ttyUSB0",
-    "baudrate": 19200,
-    "timeout": 35,
-    "devices": [
-      {
-        "unitId": 1,
-        "deviceName": "Temp Sensor",
-        "attributesPollPeriod": 5000,
-        "timeseriesPollPeriod": 5000,
-        "sendDataOnlyOnChange": true,
-        "attributes": [
-          {
-            "byteOrder": "BIG",
-            "tag": "test",
-            "type": "long",
-            "functionCode": 4,
-            "registerCount": 1,
-            "address": 4
-          }
-        ]
-      }
-    ]
-  }
-}
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json
deleted file mode 100755
index 6b78a7cec9..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/mqtt.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "broker": {
-    "name":"Default Local Broker",
-    "host":"127.0.0.1",
-    "port":1883,
-    "clientId": "ThingsBoard_gateway",
-    "security": {
-      "type": "basic",
-      "username": "user",
-      "password": "password"
-    }
-  },
-  "mapping": [
-    {
-      "topicFilter": "/sensor/data",
-      "converter": {
-        "type": "json",
-        "deviceNameJsonExpression": "${serialNumber}",
-        "deviceTypeJsonExpression": "${sensorType}",
-        "timeout": 60000,
-        "attributes": [
-          {
-            "type": "string",
-            "key": "model",
-            "value": "${sensorModel}"
-          },
-          {
-            "type": "string",
-            "key": "${sensorModel}",
-            "value": "on"
-          }
-        ],
-        "timeseries": [
-          {
-            "type": "double",
-            "key": "temperature",
-            "value": "${temp}"
-          },
-          {
-            "type": "double",
-            "key": "humidity",
-            "value": "${hum}"
-          }
-        ]
-      }
-    },
-    {
-      "topicFilter": "/sensor/+/data",
-      "converter": {
-        "type": "json",
-        "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/data)",
-        "deviceTypeTopicExpression": "Thermometer",
-        "timeout": 60000,
-        "attributes": [
-          {
-            "type": "string",
-            "key": "model",
-            "value": "${sensorModel}"
-          }
-        ],
-        "timeseries": [
-          {
-            "type": "double",
-            "key": "temperature",
-            "value": "${temp}"
-          },
-          {
-            "type": "double",
-            "key": "humidity",
-            "value": "${hum}"
-          }
-        ]
-      }
-    },
-    {
-      "topicFilter": "/custom/sensors/+",
-      "converter": {
-        "type": "custom",
-        "extension": "CustomMqttUplinkConverter",
-        "extension-config": {
-            "temperatureBytes" : 2,
-            "humidityBytes" :  2,
-            "batteryLevelBytes" : 1
-        }
-      }
-    }
-  ],
-  "connectRequests": [
-    {
-      "topicFilter": "sensor/connect",
-      "deviceNameJsonExpression": "${SerialNumber}"
-    },
-    {
-      "topicFilter": "sensor/+/connect",
-      "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/connect)"
-    }
-  ],
-  "disconnectRequests": [
-    {
-      "topicFilter": "sensor/disconnect",
-      "deviceNameJsonExpression": "${SerialNumber}"
-    },
-    {
-      "topicFilter": "sensor/+/disconnect",
-      "deviceNameTopicExpression": "(?<=sensor\/)(.*?)(?=\/disconnect)"
-    }
-  ],
-  "attributeUpdates": [
-    {
-      "deviceNameFilter": "SmartMeter.*",
-      "attributeFilter": "uploadFrequency",
-      "topicExpression": "sensor/${deviceName}/${attributeKey}",
-      "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
-    }
-  ],
-  "serverSideRpc": [
-    {
-      "deviceNameFilter": ".*",
-      "methodFilter": "echo",
-      "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
-      "responseTopicExpression": "sensor/${deviceName}/response/${methodName}/${requestId}",
-      "responseTimeout": 10000,
-      "valueExpression": "${params}"
-    },
-    {
-      "deviceNameFilter": ".*",
-      "methodFilter": "no-reply",
-      "requestTopicExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
-      "valueExpression": "${params}"
-    }
-  ]
-}
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json
deleted file mode 100644
index c93992a262..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/odbc.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "connection": {
-      "str": "Driver={PostgreSQL};Server=localhost;Port=5432;Database=thingsboard;Uid=postgres;Pwd=postgres;",
-      "attributes": {
-        "autocommit": true,
-        "timeout": 0
-      },
-      "encoding": "utf-8",
-      "decoding": {
-        "char": "utf-8",
-        "wchar": "utf-8",
-        "metadata": "utf-16le"
-      },
-      "reconnect": true,
-      "reconnectPeriod": 60
-    },
-    "pyodbc": {
-      "pooling": false
-    },
-    "polling": {
-      "query": "SELECT bool_v, str_v, dbl_v, long_v, entity_id, ts FROM ts_kv WHERE ts > ? ORDER BY ts ASC LIMIT 10",
-      "period": 10,
-      "iterator": {
-        "column": "ts",
-        "query": "SELECT MIN(ts) - 1 FROM ts_kv",
-        "persistent": false
-      }
-    },
-    "mapping": {
-      "device": {
-        "type": "postgres",
-        "name": "'ODBC ' + entity_id"
-      },
-      "sendDataOnlyOnChange": false,
-      "attributes": "*",
-      "timeseries": [
-        {
-          "name": "value",
-          "value": "[i for i in [str_v, long_v, dbl_v,bool_v] if i is not None][0]"
-        }
-      ]
-    },
-    "serverSideRpc": {
-      "enableUnknownRpc": false,
-      "overrideRpcConfig": true,
-      "methods": [
-        "procedureOne",
-        {
-          "name": "procedureTwo",
-          "args": [ "One", 2, 3.0 ]
-        }
-      ]
-    }
-  }
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json
deleted file mode 100755
index 1deed7d524..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/opcua.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "server": {
-    "name": "OPC-UA Default Server",
-    "url": "localhost:4840/freeopcua/server/",
-    "timeoutInMillis": 5000,
-    "scanPeriodInMillis": 5000,
-    "disableSubscriptions":false,
-    "subCheckPeriodInMillis": 100,
-    "showMap": false,
-    "security": "Basic128Rsa15",
-    "identity": {
-      "type": "anonymous"
-    },
-    "mapping": [
-      {
-        "deviceNodePattern": "Root\\.Objects\\.Device1",
-        "deviceNamePattern": "Device ${Root\\.Objects\\.Device1\\.serialNumber}",
-        "attributes": [
-          {
-            "key": "temperature °C",
-            "path": "${ns=2;i=5}"
-          }
-        ],
-        "timeseries": [
-          {
-            "key": "humidity",
-            "path": "${Root\\.Objects\\.Device1\\.TemperatureAndHumiditySensor\\.Humidity}"
-          },
-          {
-            "key": "batteryLevel",
-            "path": "${Battery\\.batteryLevel}"
-          }
-        ],
-        "rpc_methods": [
-          {
-            "method": "multiply",
-            "arguments": [2, 4]
-          }
-        ],
-        "attributes_updates": [
-          {
-            "attributeOnThingsBoard": "deviceName",
-            "attributeOnDevice": "Root\\.Objects\\.Device1\\.serialNumber"
-          }
-        ]
-      }
-    ]
-  }
-}
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json
deleted file mode 100644
index 43237a7dc0..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/request.json
+++ /dev/null
@@ -1,146 +0,0 @@
-"job": "leader"
-},
-"allowRedirects": true,
-"timeout": 0.5,
-"scanPeriod": 5,
-"converter": {
-  "type": "json",
-  "deviceNameJsonExpression": "SD8500",
-  "deviceTypeJsonExpression": "SD",
-  "attributes": [
-    {
-      "key": "serialNumber",
-      "type": "string",
-      "value": "${serial}"
-    }
-  ],
-  "telemetry": [
-    {
-      "key": "Maintainer",
-      "type": "string",
-      "value": "${Developer}"
-    }
-  ]
-}
-},
-{
-"url": "get_info",
-"httpMethod": "GET",
-"httpHeaders": {
-  "ACCEPT": "application/json"
-},
-"allowRedirects": true,
-"timeout": 0.5,
-"scanPeriod": 100,
-"converter": {
-  "type": "custom",
-  "deviceNameJsonExpression": "SD8500",
-  "deviceTypeJsonExpression": "SD",
-  "extension": "CustomRequestUplinkConverter",
-  "extension-config": [
-    {
-      "key": "Totaliser",
-      "type": "float",
-      "fromByte": 0,
-      "toByte": 4,
-      "byteorder": "big",
-      "signed": true,
-      "multiplier": 1
-    },
-    {
-      "key": "Flow",
-      "type": "int",
-      "fromByte": 4,
-      "toByte": 6,
-      "byteorder": "big",
-      "signed": true,
-      "multiplier": 0.01
-    },
-    {
-      "key": "Temperature",
-      "type": "int",
-      "fromByte": 8,
-      "toByte": 10,
-      "byteorder": "big",
-      "signed": true,
-      "multiplier": 0.01
-    },
-    {
-      "key": "Pressure",
-      "type": "int",
-      "fromByte": 12,
-      "toByte": 14,
-      "byteorder": "big",
-      "signed": true,
-      "multiplier": 0.01
-    },
-    {
-      "key": "deviceStatus",
-      "type": "int",
-      "byteAddress": 15,
-      "fromBit": 4,
-      "toBit": 8,
-      "byteorder": "big",
-      "signed": false
-    },
-    {
-      "key": "OUT2",
-      "type": "int",
-      "byteAddress": 15,
-      "fromBit": 1,
-      "toBit": 2,
-      "byteorder": "big"
-    },
-    {
-      "key": "OUT1",
-      "type": "int",
-      "byteAddress": 15,
-      "fromBit": 0,
-      "toBit": 1,
-      "byteorder": "big"
-    }
-  ]
-}
-}
-],
-"attributeUpdates": [
-{
-  "httpMethod": "POST",
-  "httpHeaders": {
-    "CONTENT-TYPE": "application/json"
-  },
-  "timeout": 0.5,
-  "tries": 3,
-  "allowRedirects": true,
-  "deviceNameFilter": "SD.*",
-  "attributeFilter": "send_data",
-  "requestUrlExpression": "sensor/${deviceName}/${attributeKey}",
-  "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
-}
-],
-"serverSideRpc": [
-{
-"deviceNameFilter": ".*",
-"methodFilter": "echo",
-"requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
-"responseTimeout": 1,
-"httpMethod": "GET",
-"valueExpression": "${params}",
-"timeout": 0.5,
-"tries": 3,
-"httpHeaders": {
-  "Content-Type": "application/json"
-}
-},
-{
-"deviceNameFilter": ".*",
-"methodFilter": "no-reply",
-"requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
-"httpMethod": "POST",
-"valueExpression": "${params}",
-"httpHeaders": {
-  "Content-Type": "application/json"
-}
-}
-]
-}
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json
deleted file mode 100644
index be6c6ff18e..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/rest.json
+++ /dev/null
@@ -1,152 +0,0 @@
-{
-    "host": "127.0.0.1",
-    "port": "5000",
-    "mapping":[
-      {
-        "endpoint": "/device1",
-        "HTTPMethods": [
-          "POST"
-        ],
-        "security":
-        {
-          "type": "basic",
-          "username": "user",
-          "password": "passwd"
-        },
-        "converter": {
-          "type": "json",
-          "deviceNameExpression": "Device ${name}",
-          "deviceTypeExpression": "default",
-          "attributes": [
-            {
-              "type": "string",
-              "key": "model",
-              "value": "${sensorModel}"
-            }
-          ],
-          "timeseries": [
-            {
-              "type": "double",
-              "key": "${sensorModel}",
-              "value": "${temp}"
-            },
-            {
-              "type": "double",
-              "key": "humidity",
-              "value": "${hum}"
-            }
-          ]
-        }
-      },
-      {
-        "endpoint": "/anon1",
-        "HTTPMethods": [
-          "GET",
-          "POST"
-        ],
-        "security":
-        {
-          "type": "anonymous"
-        },
-        "converter": {
-          "type": "json",
-          "deviceNameExpression": "Device 2",
-          "deviceTypeExpression": "default",
-          "attributes": [
-            {
-              "type": "string",
-              "key": "model",
-              "value": "Model2"
-            }
-          ],
-          "timeseries": [
-            {
-              "type": "double",
-              "key": "temperature",
-              "value": "${temp}"
-            },
-            {
-              "type": "double",
-              "key": "humidity",
-              "value": "${hum}"
-            }
-          ]
-        }
-      },
-      {
-        "endpoint": "/anon2",
-        "HTTPMethods": [
-          "POST"
-        ],
-        "security":
-        {
-          "type": "anonymous"
-        },
-        "converter": {
-          "type": "custom",
-          "deviceNameExpression": "SuperAnonDevice",
-          "deviceTypeExpression": "default",
-          "extension": "CustomRestUplinkConverter",
-          "extension-config": [
-            {
-            "key": "Totaliser",
-            "datatype": "float",
-            "fromByte": 0,
-            "toByte": 4,
-            "byteorder": "big",
-            "signed": true,
-            "multiplier": 1
-            }]
-        }
-      }
-    ],
-    "attributeUpdates": [
-        {
-          "HTTPMethod": "POST",
-          "SSLVerify": false,
-          "httpHeaders": {
-            "CONTENT-TYPE": "application/json"
-          },
-          "security": {
-            "type": "basic",
-            "username": "user",
-            "password": "passwd"
-          },
-          "timeout": 0.5,
-          "tries": 3,
-          "allowRedirects": true,
-          "deviceNameFilter": ".*REST$",
-          "attributeFilter": "data",
-          "requestUrlExpression": "sensor/${deviceName}/${attributeKey}",
-          "valueExpression": "{\"${attributeKey}\":\"${attributeValue}\"}"
-        }
-    ],
-    "serverSideRpc": [
-      {
-        "deviceNameFilter": ".*",
-        "methodFilter": "echo",
-        "requestUrlExpression": "http://127.0.0.1:5001/${deviceName}",
-        "responseTimeout": 1,
-        "HTTPMethod": "GET",
-        "valueExpression": "${params}",
-        "timeout": 0.5,
-        "tries": 3,
-        "httpHeaders": {
-          "Content-Type": "application/json"
-        },
-        "security": {
-          "type": "anonymous"
-        }
-      },
-      {
-        "deviceNameFilter": ".*",
-        "methodFilter": "no-reply",
-        "requestUrlExpression": "sensor/${deviceName}/request/${methodName}/${requestId}",
-        "HTTPMethod": "POST",
-        "valueExpression": "${params}",
-        "httpHeaders": {
-          "Content-Type": "application/json"
-        }
-      }
-    ]
-  }
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json
deleted file mode 100644
index b4ddb42645..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/snmp.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
-    "devices": [
-      {
-        "deviceName": "SNMP router",
-        "deviceType": "snmp",
-        "ip": "snmp.live.gambitcommunications.com",
-        "port": 161,
-        "pollPeriod": 5000,
-        "community": "public",
-        "attributes": [
-          {
-            "key": "ReceivedFromGet",
-            "method": "get",
-            "oid": "1.3.6.1.2.1.1.1.0",
-            "timeout": 6
-          },
-          {
-            "key": "ReceivedFromMultiGet",
-            "method": "multiget",
-            "oid": [
-              "1.3.6.1.2.1.1.1.0",
-              "1.3.6.1.2.1.1.2.0"
-            ],
-            "timeout": 6
-          },
-          {
-            "key": "ReceivedFromGetNext",
-            "method": "getnext",
-            "oid": "1.3.6.1.2.1.1.1.0",
-            "timeout": 6
-          },
-          {
-            "key": "ReceivedFromMultiWalk",
-            "method": "multiwalk",
-            "oid": [
-              "1.3.6.1.2.1.1.1.0",
-              "1.3.6.0.1.2.1"
-            ]
-          },
-          {
-            "key": "ReceivedFromBulkWalk",
-            "method": "bulkwalk",
-            "oid": [
-              "1.3.6.1.2.1.1.1.0",
-              "1.3.6.1.2.1.1.2.0"
-            ]
-          },
-          {
-            "key": "ReceivedFromBulkGet",
-            "method": "bulkget",
-            "scalarOid": [
-              "1.3.6.1.2.1.1.1.0",
-              "1.3.6.1.2.1.1.2.0"
-            ],
-            "repeatingOid": [
-              "1.3.6.1.2.1.1.1.0",
-              "1.3.6.1.2.1.1.2.0"
-            ],
-            "maxListSize": 10
-          }
-        ],
-        "telemetry": [
-          {
-            "key": "ReceivedFromWalk",
-            "community": "private",
-            "method": "walk",
-            "oid": "1.3.6.1.2.1.1.1.0"
-          },
-          {
-            "key": "ReceivedFromTable",
-            "method": "table",
-            "oid": "1.3.6.1.2.1.1"
-          }
-        ],
-        "attributeUpdateRequests": [
-          {
-            "attributeFilter": "dataToSet",
-            "method": "set",
-            "oid": "1.3.6.1.2.1.1.1.0"
-          },
-          {
-            "attributeFilter": "dataToMultiSet",
-            "method": "multiset",
-            "mappings": {
-              "1.2.3": "10",
-              "2.3.4": "${attribute}"
-            }
-          }
-        ],
-        "serverSideRpcRequests": [
-          {
-            "requestFilter": "setData",
-            "method": "set",
-            "oid": "1.3.6.1.2.1.1.1.0"
-          },
-          {
-            "requestFilter": "multiSetData",
-            "method": "multiset"
-          },
-          {
-            "requestFilter": "getData",
-            "method": "get",
-            "oid": "1.3.6.1.2.1.1.1.0"
-          },
-          {
-            "requestFilter": "runBulkWalk",
-            "method": "bulkwalk",
-            "oid": [
-              "1.3.6.1.2.1.1.1.0",
-              "1.3.6.1.2.1.1.2.0"
-            ]
-          }
-        ]
-      },
-      {
-        "deviceName": "SNMP router",
-        "deviceType": "snmp",
-        "ip": "127.0.0.1",
-        "pollPeriod": 5000,
-        "community": "public",
-        "converter": "CustomSNMPConverter",
-        "attributes": [
-          {
-            "key": "ReceivedFromGetWithCustomConverter",
-            "method": "get",
-            "oid": "1.3.6.1.2.1.1.1.0"
-          }
-        ],
-        "telemetry": [
-          {
-            "key": "ReceivedFromTableWithCustomConverter",
-            "method": "table",
-            "oid": "1.3.6.1.2.1.1.1.0"
-          }
-        ]
-      }
-    ]
-  }
-\ No newline at end of file
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml
deleted file mode 100755
index e3eb8f1fc7..0000000000
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/tb_gateway.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-thingsboard:
-  host: demo.thingsboard.io
-  port: 1883
-  remoteConfiguration: false
-  security:
-    accessToken: PUT_YOUR_GW_ACCESS_TOKEN_HERE
-storage:
-  type: memory
-  read_records_count: 100
-  max_records_count: 100000
-#  type: file
-#  data_folder_path: ./data/
-#  max_file_count: 10
-#  max_read_records_count: 10
-#  max_records_per_file: 10000
-connectors:
-  -
-    name: MQTT Broker Connector
-    type: mqtt
-    configuration: mqtt.json
-#  -
-#    name: Modbus Connector
-#    type: modbus
-#    configuration: modbus.json
-#
-#  -
-#    name: Modbus Connector
-#    type: modbus
-#    configuration: modbus_serial.json
-#
-#  -
-#    name: OPC-UA Connector
-#    type: opcua
-#    configuration: opcua.json
-#
-#  -
-#    name: BLE Connector
-#    type: ble
-#    configuration: ble.json
-#
-#  -
-#    name: REQUEST Connector
-#    type: request
-#    configuration: request.json
-#
-#  -
-#    name: CAN Connector
-#    type: can
-#    configuration: can.json
-#
-#  -
-#    name: BACnet Connector
-#    type: bacnet
-#    configuration: bacnet.json
-#
-#  -
-#    name: ODBC Connector
-#    type: odbc
-#    configuration: odbc.json
-#
-#  -
-#    name: Custom Serial Connector
-#    type: serial
-#    configuration: custom_serial.json
-#    class: CustomSerialConnector
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service
index 5dd352a553..0b7601d494 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway/thingsboard-gateway.service
@@ -1,13 +1,17 @@
 [Unit]
-Description = Systemd service for Thingsboard Gateway
+Description=ThingsBoard Gateway
-After       = network.target
+After=network-online.target
+Wants=network-online.target
+ConditionPathExists=/etc/thingsboard-gateway/config/tb_gateway.json
 [Service]
-ExecStart   = /usr/bin/python3 /usr/bin/thingsboard-gateway
+Type=simple
-ExecStop    = /bin/kill -INT $MAINPID
+User=thingsboard_gateway
-ExecReload  = /bin/kill -TERM $MAINPID
+Group=thingsboard_gateway
-Restart     = always
+ExecStart=/usr/bin/python3 /usr/bin/thingsboard-gateway
-Type        = simple
+ExecStop=/bin/kill -INT $MAINPID
+ExecReload=/bin/kill -TERM $MAINPID
+Restart=on-failure
 [Install]
 WantedBy=multi-user.target
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.7.4.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.7.4.bb
index 57e162cabd..7a82414937 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.7.4.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.7.4.bb
@@ -21,47 +21,61 @@ RDEPENDS:${PN} += " python3-jsonpath-rw \
                    python3-requests \
                    python3-pip \
                    python3-pyrsistent \
+                    python3-cachetools \
+                    python3-orjson \
+                    python3-psutil \
+                    python3-pybase64 \
+                    python3-grpcio \
+                    python3-packaging \
+                    python3-protobuf \
+                    python3-service-identity \
+                    python3-termcolor \
+                    python3-charset-normalizer \
+                    python3-mmh3 \
+                    python3-dateutil \
+                    python3-setuptools \
+                    python3-urllib3 \
+                    python3-questionary \
+                    python3-pyfiglet \
+                    python3-cryptography \
+                    python3-pysocks \
 "
-SRC_URI += "file://bacnet.json \
+SRC_URI += "file://thingsboard-gateway.service"
-            file://ble.json \
-            file://can.json \
-            file://custom_serial.json \
-            file://modbus.json \
-            file://modbus_serial.json \
-            file://mqtt.json \
-            file://opcua.json \
-            file://odbc.json \
-            file://request.json \
-            file://rest.json \
-            file://snmp.json \
-            file://tb_gateway.yaml \
-            file://logs.conf \
-            file://thingsboard-gateway.service \
-            "
+inherit systemd useradd
-inherit systemd
 SYSTEMD_PACKAGES = "${PN}"
 SYSTEMD_SERVICE:${PN} = "thingsboard-gateway.service"
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = " \
+    --system --no-create-home \
+    --comment 'ThingsBoard-Gateway Service' \
+    --home-dir ${localstatedir}/lib/${BPN} \
+    --shell ${base_sbindir}/nologin \
+    --gid thingsboard_gateway thingsboard_gateway"
+GROUPADD_PARAM:${PN} = "--system thingsboard_gateway"
 FILES:${PN} += "/etc \
                /lib \
                /usr \
+                ${localstatedir} \
 "
 do_install:append(){
+    install -d ${D}${sysconfdir}/${BPN}/config
+    install -m 0644 ${S}/thingsboard_gateway/config/*.json ${D}${sysconfdir}/${BPN}/config
+    chown -R thingsboard_gateway:thingsboard_gateway ${D}${sysconfdir}/${BPN}
-    install -d ${D}${sysconfdir}/thingsboard-gateway/config
+    install -d ${D}${systemd_system_unitdir}/
-    for file in $(find ${UNPACKDIR} -maxdepth 1 -type f -name *.json); do
-        install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config
-    done
-    install -m 0644 ${UNPACKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config
-    install -m 0644 ${UNPACKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config
-    install -d ${D}${systemd_unitdir}/system/
    install -m 0644 ${UNPACKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        install -d ${D}${sysconfdir}/tmpfiles.d
+        echo "d ${localstatedir}/log/${BPN} 0755 thingsboard_gateway thingsboard_gateway -" \
+            > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
+        echo "d ${localstatedir}/lib/${BPN} 0755 thingsboard_gateway thingsboard_gateway -" \
+            >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf
+    fi
 }
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
index 91d266a2d5..a8c74c1b45 100644
--- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
+++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.18.bb
@@ -22,6 +22,7 @@ SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \
 SRCREV = "2a2984488d6de8f7a2d1f5938e03ca7be57e227c"
+RDEPENDS:${PN} = "libgcc"
 inherit autotools
diff --git a/meta-oe/recipes-crypto/botan/botan_3.7.1.bb b/meta-oe/recipes-crypto/botan/botan_3.9.0.bb
index 74f895cf3c..77bd0d007f 100644
--- a/meta-oe/recipes-crypto/botan/botan_3.7.1.bb
+++ b/meta-oe/recipes-crypto/botan/botan_3.9.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=3f911cecfc74a2d9f1ead9a07bd92a6e"
 SECTION = "libs"
 SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz"
-SRC_URI[sha256sum] = "fc0620463461caaea8e60f06711d7e437a3ad1eebd6de4ac29c14bbd901ccd1b"
+SRC_URI[sha256sum] = "8c3f284b58ddd42e8e43e9fa86a7129d87ea7c3f776a80d3da63ec20722b0883"
 S = "${UNPACKDIR}/Botan-${PV}"
@@ -24,8 +24,6 @@ do_configure() {
        --cc-bin="${CXX}" \
        --cxxflags="${CXXFLAGS}" \
        --ldflags="${LDFLAGS}" \
-        --with-endian=${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \
-        ${@bb.utils.contains("TUNE_FEATURES","neon","","--disable-neon",d)} \
        --with-sysroot-dir=${STAGING_DIR_HOST} \
        --with-build-dir="${B}" \
        --optimize-for-size \
@@ -36,12 +34,14 @@ do_configure() {
 }
 do_compile() {
+        sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/build/target_info.h
        oe_runmake
 }
 do_install() {
        oe_runmake DESTDIR=${D} install
        sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${D}${includedir}/botan-3/botan/build.h
-        
        # Add botan binary and test tool
        install -d ${D}${bindir}
        install -d ${D}${datadir}/${PN}/tests/data
diff --git a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch b/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
deleted file mode 100644
index 9cc5ad9b86..0000000000
--- a/meta-oe/recipes-dbs/psqlodbc/files/0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5bfa9f1cd0523a0cad70cacf5ecf8c1aeb06c4d0 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <martin.jansa@gmail.com>
-Date: Tue, 22 Apr 2025 17:47:02 +0000
-Subject: [PATCH] configure: make sure to call AC_CHECK_HEADER_STDBOOL
-before using ac_cv_sizeof_bool
-It was called after this conditional, so PG_USE_STDBOOL wasn't set
-even when it should be as shown in at the end of config.log:
-  ac_cv_header_stdbool_h=yes
-  ac_cv_sizeof_bool=1
-  ac_cv_type__Bool=yes
-  #define SIZEOF_BOOL 1
-  #define HAVE__BOOL 1
-  #define HAVE_STDBOOL_H 1
-* fixes:
-  https://github.com/postgresql-interfaces/psqlodbc/issues/110
-  https://github.com/postgresql-interfaces/psqlodbc/issues/94
-Upstream-Status: Submitted [https://github.com/postgresql-interfaces/psqlodbc/pull/112]
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac
-index f35c825..ea363ca 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -28,9 +28,11 @@ AC_CHECK_SIZEOF([bool], [],
- #include <stdbool.h>
- #endif])
- 
-+AC_CHECK_HEADER_STDBOOL()
-+
- dnl We use <stdbool.h> if we have it and it declares type bool as having
- dnl size 1.  Otherwise, c.h will fall back to declaring bool as unsigned char.
-if test "$ac_cv_header_stdbool_h" = yes -a "$ac_cv_sizeof_bool" = 1; then
-+if test "$ac_cv_header_stdbool_h" = yes && test "$ac_cv_sizeof_bool" = 1; then
-   AC_DEFINE([PG_USE_STDBOOL], 1,
-             [Define to 1 to use <stdbool.h> to define type bool.])
- fi
diff --git a/meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch b/meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch
new file mode 100644
index 0000000000..af25b207c8
--- /dev/null
+++ b/meta-oe/recipes-dbs/psqlodbc/files/add-expected-output-file-for-descrec-test.patch
@@ -0,0 +1,72 @@
+From 453a8bdcaafde9fcd108a195ffea3ccb5c4d0a21 Mon Sep 17 00:00:00 2001
+From: Christoph Berg <myon@debian.org>
+Date: Mon, 16 Jun 2025 20:25:26 +0200
+Subject: [PATCH] Add expected output file for descrec test in C locale (#131)
+When running with LC_ALL=C, SQL_DESC_OCTET_LENGTH matches the character
+length. Add "10" as accepted value.
+The net diff to the existing descrec.out file is this:
+ test/expected/descrec.out      2025-06-13 19:02:36.460302799 +0200
+ test/expected/descrec_2.out    2025-06-16 14:34:44.270543393 +0200
+ @@ -19,7 +19,7 @@
+  -- Column 3 --
+  SQL_DESC_NAME: col3
+  SQL_DESC_TYPE: 12
+ -SQL_DESC_OCTET_LENGTH: 40
+ +SQL_DESC_OCTET_LENGTH: 10
+  SQL_DESC_PRECISION: 0
+  SQL_DESC_SCALE: 0
+  SQL_DESC_NULLABLE: 0
+Fixes #51.
+Upstream-Status: Backport [https://github.com/postgresql-interfaces/psqlodbc/commit/453a8bdcaafde9fcd108a195ffea3ccb5c4d0a21]
+Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
+---
+ test/expected/descrec_2.out | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+ create mode 100644 test/expected/descrec_2.out
+diff --git a/test/expected/descrec_2.out b/test/expected/descrec_2.out
+new file mode 100644
+index 0000000..6f61c49
+--- /dev/null
+++ b/test/expected/descrec_2.out
+@@ -0,0 +1,34 @@
+connected
+
+-- Column 1 --
+SQL_DESC_NAME: col1
+SQL_DESC_TYPE: 4
+SQL_DESC_OCTET_LENGTH: 0
+SQL_DESC_PRECISION: 0
+SQL_DESC_SCALE: 0
+SQL_DESC_NULLABLE: 0
+
+-- Column 2 --
+SQL_DESC_NAME: col2
+SQL_DESC_TYPE: 2
+SQL_DESC_OCTET_LENGTH: 6
+SQL_DESC_PRECISION: 4
+SQL_DESC_SCALE: 2
+SQL_DESC_NULLABLE: 1
+
+-- Column 3 --
+SQL_DESC_NAME: col3
+SQL_DESC_TYPE: 12
+SQL_DESC_OCTET_LENGTH: 10
+SQL_DESC_PRECISION: 0
+SQL_DESC_SCALE: 0
+SQL_DESC_NULLABLE: 0
+
+-- Column 4 --
+SQL_DESC_NAME: col4
+SQL_DESC_TYPE: -5
+SQL_DESC_OCTET_LENGTH: 8
+SQL_DESC_PRECISION: 0
+SQL_DESC_SCALE: 0
+SQL_DESC_NULLABLE: 0
+disconnecting
diff --git a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb
index dfd7f6a1e6..2fbd8b78e4 100644
--- a/meta-oe/recipes-dbs/psqlodbc/psqlodbc_16.00.0000.bb
+++ b/meta-oe/recipes-dbs/psqlodbc/psqlodbc_17.00.0006.bb
@@ -19,11 +19,12 @@ HOMEPAGE = "https://odbc.postgresql.org/"
 LICENSE = "LGPL-2.0-only"
 LIC_FILES_CHKSUM = "file://license.txt;md5=6db3822fc7512e83087ba798da013692"
-SRC_URI = "http://ftp.postgresql.org/pub/odbc/versions.old/src/${BPN}-${PV}.tar.gz \
+PV_WITH_USCORE = "${@d.getVar('PV').replace('.', '_')}"
+SRC_URI = "git://github.com/postgresql-interfaces/psqlodbc.git;protocol=https;branch=main;tag=REL-${PV_WITH_USCORE} \
    file://psqlodbc-remove-some-checks-for-cross-compiling.patch \
    file://psqlodbc-donot-use-the-hardcode-libdir.patch \
    file://psqlodbc-fix-for-ptest-support.patch \
-    file://0001-configure-make-sure-to-call-AC_CHECK_HEADER_STDBOOL.patch \
+    file://add-expected-output-file-for-descrec-test.patch \
    file://run-ptest \
 "
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
index a872be5b54..9950be4c90 100644
--- a/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
+++ b/meta-oe/recipes-dbs/rocksdb/files/0001-checkpoint.h-Add-missing-includes-cstdint.patch
@@ -27,10 +27,8 @@ Signed-off-by: mark.yang <mark.yang@lge.com>
 include/rocksdb/utilities/checkpoint.h | 1 +
 1 file changed, 1 insertion(+)
-Index: git/include/rocksdb/utilities/checkpoint.h
+--- a/include/rocksdb/utilities/checkpoint.h
-===================================================================
+++ b/include/rocksdb/utilities/checkpoint.h
--- git.orig/include/rocksdb/utilities/checkpoint.h
-+++ git/include/rocksdb/utilities/checkpoint.h
 @@ -7,6 +7,7 @@
 
 #pragma once
@@ -39,3 +37,13 @@ Index: git/include/rocksdb/utilities/checkpoint.h
 #include <string>
 #include <vector>
 
+--- a/include/rocksdb/utilities/transaction_db_mutex.h
+++ b/include/rocksdb/utilities/transaction_db_mutex.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
+#include <cstdint>
+ #include <memory>
+ 
+ #include "rocksdb/status.h"
diff --git a/meta-oe/recipes-devtools/php/php_8.4.13.bb b/meta-oe/recipes-devtools/php/php_8.4.14.bb
index 527d825189..483ba19ddd 100644
--- a/meta-oe/recipes-devtools/php/php_8.4.13.bb
+++ b/meta-oe/recipes-devtools/php/php_8.4.14.bb
@@ -29,7 +29,7 @@ SRC_URI:append:class-target = " \
 S = "${UNPACKDIR}/php-${PV}"
-SRC_URI[sha256sum] = "85181ddca7b3e03f148521b043bd62411950d468c667db6400479f1b10812194"
+SRC_URI[sha256sum] = "f2139ce4cb7a6c5643ee98caa34e5c32ba841c2ba293e34a3d0357faa84bb3e7"
 CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
 CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."
diff --git a/meta-oe/recipes-extended/libyang/libyang_3.13.5.bb b/meta-oe/recipes-extended/libyang/libyang_3.13.5.bb
index 9dad6ba279..4260111200 100644
--- a/meta-oe/recipes-extended/libyang/libyang_3.13.5.bb
+++ b/meta-oe/recipes-extended/libyang/libyang_3.13.5.bb
@@ -16,7 +16,10 @@ SRC_URI = "git://github.com/CESNET/libyang.git;branch=master;protocol=https;tag=
 # Main dependencies
 inherit cmake pkgconfig lib_package ptest multilib_header
-DEPENDS = "libpcre2"
+DEPENDS = " \
+    libpcre2 \
+    xxhash \
+"
 DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}"
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release"
diff --git a/meta-python/recipes-devtools/python/python3-aiohttp_3.12.15.bb b/meta-python/recipes-devtools/python/python3-aiohttp_3.12.15.bb
index cb8aa96d00..6ca05d0596 100644
--- a/meta-python/recipes-devtools/python/python3-aiohttp_3.12.15.bb
+++ b/meta-python/recipes-devtools/python/python3-aiohttp_3.12.15.bb
@@ -21,3 +21,5 @@ RDEPENDS:${PN} = "\
    python3-yarl \
    python3-aiodns \
 "
+CFLAGS:append:arm = " -flax-vector-conversions"
diff --git a/meta-python/recipes-devtools/python/python3-cytoolz_1.1.0.bb b/meta-python/recipes-devtools/python/python3-cytoolz_1.1.0.bb
index 9840fbfbd6..a75948a006 100644
--- a/meta-python/recipes-devtools/python/python3-cytoolz_1.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-cytoolz_1.1.0.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d422ebce3e9c6447563bd410e9b22f2e"
 SRC_URI[sha256sum] = "13a7bf254c3c0d28b12e2290b82aed0f0977a4c2a2bf84854fcdc7796a29f3b0"
-inherit pypi setuptools3 cython
+inherit pypi python_setuptools_build_meta cython
+DEPENDS += "python3-setuptools-git-versioning-native"
 RDEPENDS:${PN} += "python3-toolz"
diff --git a/meta-python/recipes-devtools/python/python3-mmh3_5.2.0.bb b/meta-python/recipes-devtools/python/python3-mmh3_5.2.0.bb
new file mode 100644
index 0000000000..c719762885
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-mmh3_5.2.0.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Python extension for MurmurHash (MurmurHash3), a set of fast and \
+           robust hash functions"
+HOMEPAGE = "https://github.com/hajimes/mmh3"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2edf2352bb2cd3d7787f05247781b314"
+inherit pypi python_setuptools_build_meta
+SRC_URI[sha256sum] = "1efc8fec8478e9243a78bb993422cf79f8ff85cb4cf6b79647480a31e0d950a8"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-orjson-crates.inc b/meta-python/recipes-devtools/python/python3-orjson-crates.inc
new file mode 100644
index 0000000000..76ed174329
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-orjson-crates.inc
@@ -0,0 +1,84 @@
+# Autogenerated with 'bitbake -c update_crates python3-orjson'
+# from Cargo.lock
+SRC_URI += " \
+    crate://crates.io/associative-cache/2.0.0 \
+    crate://crates.io/bytecount/0.6.8 \
+    crate://crates.io/castaway/0.2.3 \
+    crate://crates.io/cc/1.2.20 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/compact_str/0.9.0 \
+    crate://crates.io/crunchy/0.2.3 \
+    crate://crates.io/encoding_rs/0.8.35 \
+    crate://crates.io/gimli/0.31.1 \
+    crate://crates.io/half/2.6.0 \
+    crate://crates.io/itoa/1.0.15 \
+    crate://crates.io/itoap/1.0.1 \
+    crate://crates.io/jiff/0.2.10 \
+    crate://crates.io/jiff-static/0.2.10 \
+    crate://crates.io/libc/0.2.172 \
+    crate://crates.io/memchr/2.7.4 \
+    crate://crates.io/once_cell/1.21.3 \
+    crate://crates.io/portable-atomic/1.11.0 \
+    crate://crates.io/portable-atomic-util/0.2.4 \
+    crate://crates.io/proc-macro2/1.0.95 \
+    crate://crates.io/pyo3-build-config/0.23.3 \
+    crate://crates.io/pyo3-ffi/0.23.3 \
+    crate://crates.io/quote/1.0.40 \
+    crate://crates.io/rustversion/1.0.20 \
+    crate://crates.io/ryu/1.0.20 \
+    crate://crates.io/serde/1.0.219 \
+    crate://crates.io/serde_derive/1.0.219 \
+    crate://crates.io/serde_json/1.0.140 \
+    crate://crates.io/shlex/1.3.0 \
+    crate://crates.io/simdutf8/0.1.5 \
+    crate://crates.io/smallvec/1.15.0 \
+    crate://crates.io/static_assertions/1.1.0 \
+    crate://crates.io/syn/2.0.101 \
+    crate://crates.io/target-lexicon/0.13.2 \
+    crate://crates.io/unicode-ident/1.0.18 \
+    crate://crates.io/unwinding/0.2.5 \
+    crate://crates.io/uuid/1.16.0 \
+    crate://crates.io/version_check/0.9.5 \
+    crate://crates.io/xxhash-rust/0.8.15 \
+"
+SRC_URI[associative-cache-2.0.0.sha256sum] = "b993cd767a2bc7307dd87622311ca22c44329cc7a21366206bfa0896827b2bad"
+SRC_URI[bytecount-0.6.8.sha256sum] = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+SRC_URI[castaway-0.2.3.sha256sum] = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+SRC_URI[cc-1.2.20.sha256sum] = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a"
+SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+SRC_URI[compact_str-0.9.0.sha256sum] = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
+SRC_URI[crunchy-0.2.3.sha256sum] = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
+SRC_URI[encoding_rs-0.8.35.sha256sum] = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+SRC_URI[gimli-0.31.1.sha256sum] = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+SRC_URI[half-2.6.0.sha256sum] = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+SRC_URI[itoa-1.0.15.sha256sum] = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+SRC_URI[itoap-1.0.1.sha256sum] = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8"
+SRC_URI[jiff-0.2.10.sha256sum] = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
+SRC_URI[jiff-static-0.2.10.sha256sum] = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
+SRC_URI[libc-0.2.172.sha256sum] = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+SRC_URI[once_cell-1.21.3.sha256sum] = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+SRC_URI[portable-atomic-1.11.0.sha256sum] = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+SRC_URI[portable-atomic-util-0.2.4.sha256sum] = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+SRC_URI[proc-macro2-1.0.95.sha256sum] = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+SRC_URI[pyo3-build-config-0.23.3.sha256sum] = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b"
+SRC_URI[pyo3-ffi-0.23.3.sha256sum] = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d"
+SRC_URI[quote-1.0.40.sha256sum] = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+SRC_URI[rustversion-1.0.20.sha256sum] = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
+SRC_URI[ryu-1.0.20.sha256sum] = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+SRC_URI[serde-1.0.219.sha256sum] = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+SRC_URI[serde_derive-1.0.219.sha256sum] = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+SRC_URI[shlex-1.3.0.sha256sum] = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+SRC_URI[simdutf8-0.1.5.sha256sum] = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+SRC_URI[smallvec-1.15.0.sha256sum] = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+SRC_URI[syn-2.0.101.sha256sum] = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
+SRC_URI[target-lexicon-0.13.2.sha256sum] = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+SRC_URI[unicode-ident-1.0.18.sha256sum] = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+SRC_URI[unwinding-0.2.5.sha256sum] = "51f06a05848f650946acef3bf525fe96612226b61f74ae23ffa4e98bfbb8ab3c"
+SRC_URI[uuid-1.16.0.sha256sum] = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+SRC_URI[xxhash-rust-0.8.15.sha256sum] = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
diff --git a/meta-python/recipes-devtools/python/python3-orjson_3.10.17.bb b/meta-python/recipes-devtools/python/python3-orjson_3.10.17.bb
new file mode 100644
index 0000000000..7db76c9415
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-orjson_3.10.17.bb
@@ -0,0 +1,20 @@
+SUMMARY = "orjson is a fast, correct JSON library for Python"
+HOMEPAGE = "https://pypi.org/project/orjson/"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d"
+SRC_URI[sha256sum] = "28eeae6a15243966962b658dfcf7bae9e7bb1f3260dfcf0370dbd41f5ff6058b"
+require ${BPN}-crates.inc
+inherit pypi python_maturin cargo-update-recipe-crates
+DEPENDS = "python3-maturin-native"
+RDEPENDS:${PN} += "python3-maturin python3-mypy"
+do_compile:prepend() {
+    sed -i "/panic = \"abort\"/d" ${S}/Cargo.toml
+}
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pybase64_1.4.2.bb b/meta-python/recipes-devtools/python/python3-pybase64_1.4.2.bb
new file mode 100644
index 0000000000..a551034168
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pybase64_1.4.2.bb
@@ -0,0 +1,10 @@
+SUMMARY = "Fast Base64 encoding/decoding in Python"
+HOMEPAGE = "https://github.com/mayeut/pybase64"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=84b11fa55a5d83cf6fa202fd3b49c7e8"
+inherit pypi setuptools3
+SRC_URI[sha256sum] = "46cdefd283ed9643315d952fe44de80dc9b9a811ce6e3ec97fd1827af97692d0"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-pyfiglet_1.0.4.bb b/meta-python/recipes-devtools/python/python3-pyfiglet_1.0.4.bb
new file mode 100644
index 0000000000..948bac56df
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-pyfiglet_1.0.4.bb
@@ -0,0 +1,10 @@
+SUMMARY = "An implementation of figlet written in Python"
+HOMEPAGE = "https://github.com/pwaller/pyfiglet"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f37a72c457e560fc4853ae67f3f9cc0e"
+inherit pypi python_setuptools_build_meta
+SRC_URI[sha256sum] = "db9c9940ed1bf3048deff534ed52ff2dafbbc2cd7610b17bb5eca1df6d4278ef"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-questionary_2.1.1.bb b/meta-python/recipes-devtools/python/python3-questionary_2.1.1.bb
new file mode 100644
index 0000000000..a7120dc619
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-questionary_2.1.1.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Python library to build pretty command line user prompts. Easy to \
+           use multi-select lists, confirmations, free text prompts."
+HOMEPAGE = "https://github.com/tmbo/questionary"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=19f0688967ec2b2624ee04c0136daae7"
+inherit pypi python_poetry_core
+SRC_URI[sha256sum] = "3d7e980292bb0107abaa79c68dd3eee3c561b83a0f89ae482860b181c8bd412d"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_2.1.0.bb b/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_2.1.0.bb
index 0da9d26dd3..8206e8513d 100644
--- a/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_2.1.0.bb
+++ b/meta-python/recipes-devtools/python/python3-setuptools-git-versioning_2.1.0.bb
@@ -10,8 +10,7 @@ inherit pypi setuptools3
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[python-version-smaller-3-dot-11] = ",,,python3-tomli"
-RDEPENDS:${PN} += "python3-packaging python3-setuptools \
+RDEPENDS:${PN} += "python3-core python3-datetime python3-logging \
-                   python3-core python3-datetime python3-logging \
                                   python3-packaging python3-pprint python3-setuptools \
                                   python3-tomllib"
diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
index 46b1f7c7b8..3315aa579b 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
@@ -9,7 +9,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 --- a/webmin/webmin-lib.pl
 +++ b/webmin/webmin-lib.pl
-@@ -1170,38 +1170,6 @@ my %miniserv;
+@@ -1234,52 +1234,6 @@ my %miniserv;
 &get_miniserv_config(\%miniserv);
 &load_theme_library(); # So that UI functions work
 
@@ -27,6 +27,20 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 -       else {
 -               &read_file($realos_cache_file, \%realos);
 -               }
+-       my $new_real = $realos{'real_os_version'};
+-       my $old_real = $gconfig{'real_os_version'};
+-       $new_real =~ s/\.\d+$//;
+-       $old_real =~ s/\.\d+$//;
+-       if ($realos{'real_os_type'} eq $gconfig{'real_os_type'} &&
+-           $new_real eq $old_real &&
+-           $realos{'real_os_version'} ne $gconfig{'real_os_version'}) {
+-               # Only the minor OS version has changed, just silently update it
+-               &lock_file("$config_directory/config");
+-               $gconfig{'real_os_version'} = $realos{'real_os_version'};
+-               $gconfig{'os_version'} = $realos{'os_version'};
+-               &write_file("$config_directory/config", \%gconfig);
+-               &unlock_file("$config_directory/config");
+-               }
 -       if (($realos{'os_version'} ne $gconfig{'os_version'} ||
 -            $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
 -            $realos{'os_type'} ne $gconfig{'os_type'}) &&
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
index 65e1d77629..cd9a522bb6 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
@@ -5,15 +5,14 @@ Upstream-Status: Inappropriate [config]
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 --- a/net/module.info
 +++ b/net/module.info
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
- version=2.300
- longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts.
 name=Networking
+ category=net
 -os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
 +os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
- readonly=1
 desc=Network Configuration
- category=net
+ longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts.
+ readonly=1
 --- /dev/null
 +++ b/net/generic-linux-lib.pl
 @@ -0,0 +1,2 @@
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_2.300.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.303.bb
index 1e46384465..f65898bf93 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_2.300.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.303.bb
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://mysql-config-fix.patch \
           file://webmin.service \
            "
-SRC_URI[sha256sum] = "1405dfd1f452c502169e07f00fb856fe31af122e484df03e1ac549a7eeec3001"
+SRC_URI[sha256sum] = "1317935427aa893159b2dae52a2860adbd9ba5482522115abd2422a4bb27c983"
 UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html"
 UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz"