trusted-firmware-a: Switch SRC_URI from git to tarballs

Message ID 20240626063821.9747-1-ubely@ilbers.de
State Superseded, archived
Headers show
Series trusted-firmware-a: Switch SRC_URI from git to tarballs | expand

Commit Message

Uladzimir Bely June 26, 2024, 6:38 a.m. UTC
Commit f7c0df35 should have helped with periodic fetch failures,
but the issue is happens even with github.

Switch to fetching tarballs that are smaller in size than
git tree and are expected to be more stable when fetching.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 .../trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb | 5 ++---
 .../trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

Comments

Jan Kiszka June 26, 2024, 7:43 a.m. UTC | #1
On 26.06.24 08:38, Uladzimir Bely wrote:
> Commit f7c0df35 should have helped with periodic fetch failures,
> but the issue is happens even with github.
> 
> Switch to fetching tarballs that are smaller in size than
> git tree and are expected to be more stable when fetching.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  .../trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb | 5 ++---
>  .../trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb  | 5 ++---
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb
> index bf1e3f05..675a6d87 100644
> --- a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb
> +++ b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb
> @@ -5,10 +5,9 @@
>  
>  require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
>  
> -SRC_URI += "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;branch=master"
> -SRCREV = "b6c0948400594e3cc4dbb5a4ef04b815d2675808"
> +SRC_URI += "https://github.com/ARM-software/arm-trusted-firmware/archive/v${PV}.tar.gz;downloadfilename=arm-trusted-firmware-${PV}.tar.gz"
>  

Seem you are missing the checksum for the tarball.

Jan

> -S = "${WORKDIR}/git"
> +S = "${WORKDIR}/arm-trusted-firmware-${PV}"
>  
>  TF_A_PLATFORM = "k3"
>  TF_A_EXTRA_BUILDARGS = "CFG_ARM64=y TARGET_BOARD=lite SPD=opteed"
> diff --git a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb
> index 9927b460..ca411c71 100644
> --- a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb
> +++ b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb
> @@ -5,10 +5,9 @@
>  
>  require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
>  
> -SRC_URI += "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;branch=master"
> -SRCREV = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
> +SRC_URI += "https://github.com/ARM-software/arm-trusted-firmware/archive/v${PV}.tar.gz;downloadfilename=arm-trusted-firmware-${PV}.tar.gz"
>  
> -S = "${WORKDIR}/git"
> +S = "${WORKDIR}/arm-trusted-firmware-${PV}"
>  
>  DEBIAN_BUILD_DEPENDS += ", device-tree-compiler"
>

Patch

diff --git a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb
index bf1e3f05..675a6d87 100644
--- a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb
+++ b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-beagleplay_2.10.bb
@@ -5,10 +5,9 @@ 
 
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
 
-SRC_URI += "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;branch=master"
-SRCREV = "b6c0948400594e3cc4dbb5a4ef04b815d2675808"
+SRC_URI += "https://github.com/ARM-software/arm-trusted-firmware/archive/v${PV}.tar.gz;downloadfilename=arm-trusted-firmware-${PV}.tar.gz"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/arm-trusted-firmware-${PV}"
 
 TF_A_PLATFORM = "k3"
 TF_A_EXTRA_BUILDARGS = "CFG_ARM64=y TARGET_BOARD=lite SPD=opteed"
diff --git a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb
index 9927b460..ca411c71 100644
--- a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb
+++ b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb
@@ -5,10 +5,9 @@ 
 
 require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc
 
-SRC_URI += "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;branch=master"
-SRCREV = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
+SRC_URI += "https://github.com/ARM-software/arm-trusted-firmware/archive/v${PV}.tar.gz;downloadfilename=arm-trusted-firmware-${PV}.tar.gz"
 
-S = "${WORKDIR}/git"
+S = "${WORKDIR}/arm-trusted-firmware-${PV}"
 
 DEBIAN_BUILD_DEPENDS += ", device-tree-compiler"