diff mbox series

[1/2] arm/trusted-services: upgrade in-tree nanopb

Message ID 20260310141943.1590585-1-ross.burton@arm.com
State New
Headers show
Series [1/2] arm/trusted-services: upgrade in-tree nanopb | expand

Commit Message

Ross Burton March 10, 2026, 2:19 p.m. UTC 
Trusted Services uses nanopb 0.4.8 but this imports pkg_resources from
setuptools, which has been deprecated since 2023[1] and was finally
removed in setuptools 82.

This was fixed in nanopb some time ago[2] so upgrade the recipe from
nanopb 0.48 to 0.49.1.

[1] https://setuptools.pypa.io/en/latest/deprecated/pkg_resources.html
[2] https://github.com/nanopb/nanopb/commit/7961a939ebeeb27631c6def44f3452522264c64b

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../trusted-services/trusted-services-src.inc               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
index 7638a3ea67..22cc76ef25 100644
--- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
+++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc
@@ -22,9 +22,9 @@  SRC_URI_TRUSTED_SERVICES_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;protocol
 SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
 LIC_FILES_CHKSUM += "file://ts-external/mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
 
-# Nanopb, tag "nanopb-0.4.8" plus some further fixes
-SRC_URI_TRUSTED_SERVICES_NANOPB = "git://github.com/nanopb/nanopb.git;protocol=https;branch=master"
-SRCREV_nanopb = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e"
+# Nanopb, tag "nanopb-0.4.9.1"
+SRC_URI_TRUSTED_SERVICES_NANOPB = "git://github.com/nanopb/nanopb.git;protocol=https;branch=maintenance_0.4"
+SRCREV_nanopb = "cad3c18ef15a663e30e3e43e3a752b66378adec1"
 LIC_FILES_CHKSUM += "file://ts-external/nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f"
 
 # qcbor, tag "v1.0.0"