| Message ID | 20250310120948.1807735-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm/arm-bsp/trusted-firmware-a: use main branch when fetching mbedtls | expand |
On Mon, 10 Mar 2025 12:09:47 +0000, Ross Burton wrote: > mbedtls pushes to both master and main, but main is preferred. > > Applied, thanks! [1/2] arm/arm-bsp/trusted-firmware-a: use main branch when fetching mbedtls commit: af9375798f4431a3a90a62978a7e9e18d2ad774b [2/2] CI: there's no need to run pending-updates on x86 machines commit: e02a77c0552373a9e91377fbd8b14230fce57759 Best regards,
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb index cb73b48d..d4dd8c2a 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b5fbfdeb6855162dded31fadcd5d4dc # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls # mbedtls-3.6.0 -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=main" SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" 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 e05aadd7..b30b20b6 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -24,7 +24,7 @@ SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81" LIC_FILES_CHKSUM += "file://../dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e" # MbedTLS, tag "v3.5.1" -SRC_URI += "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;branch=master;destsuffix=git/mbedtls" +SRC_URI += "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;branch=main;destsuffix=git/mbedtls" SRCREV_mbedtls = "15254759342494c7e969766d5424d78d7deb9bfa" LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
mbedtls pushes to both master and main, but main is preferred. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.11.0.bb | 2 +- .../recipes-security/trusted-services/trusted-services-src.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)