[PATCH] trusted-firmware-a: Switch SRC_URI from git to tarballs

[Uladzimir Bely]

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 <ub...@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"

-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"

--
2.44.2

[Jan Kiszka]

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 <ub...@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"
>

--

Siemens AG, Technology
Linux Expert Center

[Uladzimir Bely]

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 <ub...@ilbers.de>
---

.../trusted-firmware-a-beagleplay_2.10.bb | 6 +++---
.../trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.4.bb | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)

Changes since v1:
- Added sha256sum for downloaded tarballs

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..d7f82032 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,10 @@

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"

+SRC_URI[sha256sum] = "2e18b881ada9198173238cca80086c787b1fa3f698944bde1743142823fc511c"

-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..b36dc3ee 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,10 @@

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"

+SRC_URI[sha256sum] = "4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d"

-S = "${WORKDIR}/git"
+S = "${WORKDIR}/arm-trusted-firmware-${PV}"

DEBIAN_BUILD_DEPENDS += ", device-tree-compiler"

--

2.44.2

[Uladzimir Bely]

> 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"
> +SRC_URI[sha256sum] =
> "4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d"
>  
> -S = "${WORKDIR}/git"
> +S = "${WORKDIR}/arm-trusted-firmware-${PV}"
>  
>  DEBIAN_BUILD_DEPENDS += ", device-tree-compiler"
>  
> --
> 2.44.2
>

Applied to next.

--
Best regards,
Uladzimir.