Message ID | 20240306105015.2630056-2-delane.brandy@arm.com |
---|---|
State | New |
Headers | show |
Series | Upgrade corstone1000 to TF-A v2.10 | expand |
On Wed, Mar 06, 2024 at 02:51:06AM -0800, delane.brandy@arm.com wrote: > From: Delane Brandy <delane.brandy@arm.com> > > Update mbedTLS version as TF-A 2.10 supports mbedTLS 3.4.1, as seen: > https://trustedfirmware-a.readthedocs.io/en/v2.10/change-log.html#new-features > > Signed-off-by: Delane Brandy <delane.brandy@arm.com> > --- > .../trusted-firmware-a/trusted-firmware-a_2.10.0.bb | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > index 4f019844..d25c0aaa 100644 > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > @@ -5,8 +5,8 @@ SRCREV_tfa = "b6c0948400594e3cc4dbb5a4ef04b815d2675808" > > LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" > > -# mbedtls-3.5.1 > +# mbedtls-3.4.1 > SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" > -SRCREV_mbedtls = "edb8fec9882084344a314368ac7fd957a187519c" > +SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631" > > -LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" > +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" Why did the license checksum change? Missing License-Update: tag?
On Wed, Mar 06, 2024 at 12:02:57PM -0500, Denys Dmytriyenko wrote: > On Wed, Mar 06, 2024 at 02:51:06AM -0800, delane.brandy@arm.com wrote: > > From: Delane Brandy <delane.brandy@arm.com> > > > > Update mbedTLS version as TF-A 2.10 supports mbedTLS 3.4.1, as seen: > > https://trustedfirmware-a.readthedocs.io/en/v2.10/change-log.html#new-features > > > > Signed-off-by: Delane Brandy <delane.brandy@arm.com> > > --- > > .../trusted-firmware-a/trusted-firmware-a_2.10.0.bb | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > > index 4f019844..d25c0aaa 100644 > > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > > @@ -5,8 +5,8 @@ SRCREV_tfa = "b6c0948400594e3cc4dbb5a4ef04b815d2675808" > > > > LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" > > > > -# mbedtls-3.5.1 > > +# mbedtls-3.4.1 > > SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" > > -SRCREV_mbedtls = "edb8fec9882084344a314368ac7fd957a187519c" > > +SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631" > > > > -LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" > > +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > > Why did the license checksum change? Missing License-Update: tag? Good catch Looking at the history of that file (see https://github.com/Mbed-TLS/mbedtls/commit/8ce51708da7e5066e884be77c108a362f67bb91c), it appears it became dual licensed (with GPLv2). I'll modify the patch with the appropriate line to avoid the need for a v2. Thanks, Jon > > -- > Denys >
On Thu, Mar 07, 2024 at 09:56:53AM -0500, Jon Mason wrote: > On Wed, Mar 06, 2024 at 12:02:57PM -0500, Denys Dmytriyenko wrote: > > On Wed, Mar 06, 2024 at 02:51:06AM -0800, delane.brandy@arm.com wrote: > > > From: Delane Brandy <delane.brandy@arm.com> > > > > > > Update mbedTLS version as TF-A 2.10 supports mbedTLS 3.4.1, as seen: > > > https://trustedfirmware-a.readthedocs.io/en/v2.10/change-log.html#new-features > > > > > > Signed-off-by: Delane Brandy <delane.brandy@arm.com> > > > --- > > > .../trusted-firmware-a/trusted-firmware-a_2.10.0.bb | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > > > index 4f019844..d25c0aaa 100644 > > > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > > > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb > > > @@ -5,8 +5,8 @@ SRCREV_tfa = "b6c0948400594e3cc4dbb5a4ef04b815d2675808" > > > > > > LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" > > > > > > -# mbedtls-3.5.1 > > > +# mbedtls-3.4.1 > > > SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" > > > -SRCREV_mbedtls = "edb8fec9882084344a314368ac7fd957a187519c" > > > +SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631" > > > > > > -LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" > > > +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" > > > > Why did the license checksum change? Missing License-Update: tag? > > Good catch > > Looking at the history of that file (see > https://github.com/Mbed-TLS/mbedtls/commit/8ce51708da7e5066e884be77c108a362f67bb91c), > it appears it became dual licensed (with GPLv2). I'll modify the > patch with the appropriate line to avoid the need for a v2. > > Thanks, > Jon Actually, I'm an idiot. This is a downgrade. So, it is removing the GPLv2 to the license (which was added between mbedtls 3.4 and 3.5). So, this was fine as-is, but will need to be added if/when there is an upgrade. Sorry/Thanks, Jon > > > > > -- > > Denys > > >
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb index 4f019844..d25c0aaa 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.0.bb @@ -5,8 +5,8 @@ SRCREV_tfa = "b6c0948400594e3cc4dbb5a4ef04b815d2675808" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# mbedtls-3.5.1 +# mbedtls-3.4.1 SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" -SRCREV_mbedtls = "edb8fec9882084344a314368ac7fd957a187519c" +SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631" -LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"