[meta-arm,1/2] meta-arm: trusted-firmware-a: add branch name for mbedtls

Submitted by Usama Arif on Aug. 5, 2020, 10:16 a.m. | Patch ID: 175036

Details

Message ID 20200805101629.27959-1-usama.arif@arm.com
State New
Headers show

Commit Message

Usama Arif Aug. 5, 2020, 10:16 a.m.
It appears that the mbedtls team have moved the SHA which
meta-arm was using from master branch. It is still present
in mbedtls-2.18 branch so this is now used.

Change-Id: Ie932f446067767e85a25583b1bdc02b4739e323f
Signed-off-by: Usama Arif <usama.arif@arm.com>
Signed-off-by: Prabin CA <prabin.ca@rm.com>
---
 .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
index 8286b64..7279173 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
@@ -21,7 +21,7 @@  LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89
 # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1
 #
 
-SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls"
+SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
 
 # mbed TLS v2.18.1
 SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"

Comments

Jon Mason Aug. 7, 2020, 8:57 p.m.
It appears that these do not apply cleanly to the master branch.  I'm
not sure if it is the SMTP issue or something else.  Can you please
rebase and resend?

Thanks,
Jon


On Wed, Aug 05, 2020 at 11:16:28AM +0100, Usama Arif wrote:
> It appears that the mbedtls team have moved the SHA which
> meta-arm was using from master branch. It is still present
> in mbedtls-2.18 branch so this is now used.
> 
> Change-Id: Ie932f446067767e85a25583b1bdc02b4739e323f
> Signed-off-by: Usama Arif <usama.arif@arm.com>
> Signed-off-by: Prabin CA <prabin.ca@rm.com>
> ---
>  .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb    | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> index 8286b64..7279173 100644
> --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> @@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89
>  # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1
>  #
>  
> -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls"
> +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
>  
>  # mbed TLS v2.18.1
>  SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
> -- 
> 2.17.1
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#999): https://lists.yoctoproject.org/g/meta-arm/message/999
Mute This Topic: https://lists.yoctoproject.org/mt/76004589/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Jon Mason Aug. 7, 2020, 8:59 p.m.
On Fri, Aug 07, 2020 at 04:57:39PM -0400, Jon Mason via lists.yoctoproject.org wrote:
> It appears that these do not apply cleanly to the master branch.  I'm
> not sure if it is the SMTP issue or something else.  Can you please
> rebase and resend?

Disregard, I see the new versions now.

Thanks,
Jon

> 
> Thanks,
> Jon
> 
> 
> On Wed, Aug 05, 2020 at 11:16:28AM +0100, Usama Arif wrote:
> > It appears that the mbedtls team have moved the SHA which
> > meta-arm was using from master branch. It is still present
> > in mbedtls-2.18 branch so this is now used.
> > 
> > Change-Id: Ie932f446067767e85a25583b1bdc02b4739e323f
> > Signed-off-by: Usama Arif <usama.arif@arm.com>
> > Signed-off-by: Prabin CA <prabin.ca@rm.com>
> > ---
> >  .../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb    | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> > index 8286b64..7279173 100644
> > --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> > +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
> > @@ -21,7 +21,7 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89
> >  # Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1
> >  #
> >  
> > -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls"
> > +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.18"
> >  
> >  # mbed TLS v2.18.1
> >  SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
> > -- 
> > 2.17.1
> > 
> 
> > 
> 

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#1000): https://lists.yoctoproject.org/g/meta-arm/message/1000
Mute This Topic: https://lists.yoctoproject.org/mt/76004589/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-