[DistroKit] [PATCH] tf-a: add current hash of v2.12 archive from Github

[DistroKit] [PATCH] tf-a: add current hash of v2.12 archive from Github

[Ahmad Fatoum]

Downloading the current release manually with:

  curl -L 'https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags/v2.12.tar.gz' | md5sum

confirms that the hash has changed:

  5b90a1c21210702e64234a2beb79f23a  -

I am unsure why, but to fix build breakage, let's list both hashes as
after extraction of both archives, the contents were found to be
completely identical.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/platformconfig | 2 +-
 configs/platform-v8a/platformconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index c3acafd25fc9..e10ac93969a2 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -207,7 +207,7 @@ PTXCONF_TF_A_STM32MP13=y
 PTXCONF_TF_A=y
 PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
 PTXCONF_TF_A_VERSION="v2.12"
-PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
+PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
 PTXCONF_TF_A_ARCH_STRING="aarch32"
 PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y
 # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 69e8d5e0696e..0c7d3b7b6b59 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -207,7 +207,7 @@ PTXCONF_BOOTLOADER=y
 PTXCONF_TF_A=y
 PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
 PTXCONF_TF_A_VERSION="v2.12"
-PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
+PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
 PTXCONF_TF_A_ARCH_STRING="aarch64"
 PTXCONF_TF_A_ARM_ARCH_MAJOR_8=y
 PTXCONF_TF_A_ARM_ARCH_MAJOR=8
-- 
2.39.5

Re: [DistroKit] [PATCH] tf-a: add current hash of v2.12 archive from Github

[Robert Schwebel]

On Tue, Dec 17, 2024 at 09:25:37AM +0100, Ahmad Fatoum wrote:
> Downloading the current release manually with:
> 
>   curl -L 'https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags/v2.12.tar.gz' | md5sum
> 
> confirms that the hash has changed:
> 
>   5b90a1c21210702e64234a2beb79f23a  -
> 
> I am unsure why, but to fix build breakage, let's list both hashes as
> after extraction of both archives, the contents were found to be
> completely identical.

Tested, works now. Applied to next.

> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  configs/platform-v7a/platformconfig | 2 +-
>  configs/platform-v8a/platformconfig | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
> index c3acafd25fc9..e10ac93969a2 100644
> --- a/configs/platform-v7a/platformconfig
> +++ b/configs/platform-v7a/platformconfig
> @@ -207,7 +207,7 @@ PTXCONF_TF_A_STM32MP13=y
>  PTXCONF_TF_A=y
>  PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
>  PTXCONF_TF_A_VERSION="v2.12"
> -PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
> +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
>  PTXCONF_TF_A_ARCH_STRING="aarch32"
>  PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y
>  # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set
> diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
> index 69e8d5e0696e..0c7d3b7b6b59 100644
> --- a/configs/platform-v8a/platformconfig
> +++ b/configs/platform-v8a/platformconfig
> @@ -207,7 +207,7 @@ PTXCONF_BOOTLOADER=y
>  PTXCONF_TF_A=y
>  PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
>  PTXCONF_TF_A_VERSION="v2.12"
> -PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
> +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
>  PTXCONF_TF_A_ARCH_STRING="aarch64"
>  PTXCONF_TF_A_ARM_ARCH_MAJOR_8=y
>  PTXCONF_TF_A_ARM_ARCH_MAJOR=8
> -- 
> 2.39.5
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

Re: [DistroKit] [PATCH] tf-a: add current hash of v2.12 archive from Github

[Roland Hieber]

On Tue, Dec 17, 2024 at 09:25:37AM +0100, Ahmad Fatoum wrote:
> Downloading the current release manually with:
> 
>   curl -L 'https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags/v2.12.tar.gz' | md5sum
> 
> confirms that the hash has changed:
> 
>   5b90a1c21210702e64234a2beb79f23a  -
> 
> I am unsure why, but to fix build breakage, let's list both hashes as
> after extraction of both archives, the contents were found to be
> completely identical.

Have you tried diffoscope? I don't have the old tarball, but sometimes the date
in the tar header differs when archives are re-packed by git.

 - Roland

> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  configs/platform-v7a/platformconfig | 2 +-
>  configs/platform-v8a/platformconfig | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
> index c3acafd25fc9..e10ac93969a2 100644
> --- a/configs/platform-v7a/platformconfig
> +++ b/configs/platform-v7a/platformconfig
> @@ -207,7 +207,7 @@ PTXCONF_TF_A_STM32MP13=y
>  PTXCONF_TF_A=y
>  PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
>  PTXCONF_TF_A_VERSION="v2.12"
> -PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
> +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
>  PTXCONF_TF_A_ARCH_STRING="aarch32"
>  PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y
>  # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set
> diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
> index 69e8d5e0696e..0c7d3b7b6b59 100644
> --- a/configs/platform-v8a/platformconfig
> +++ b/configs/platform-v8a/platformconfig
> @@ -207,7 +207,7 @@ PTXCONF_BOOTLOADER=y
>  PTXCONF_TF_A=y
>  PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
>  PTXCONF_TF_A_VERSION="v2.12"
> -PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
> +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
>  PTXCONF_TF_A_ARCH_STRING="aarch64"
>  PTXCONF_TF_A_ARM_ARCH_MAJOR_8=y
>  PTXCONF_TF_A_ARM_ARCH_MAJOR=8
> -- 
> 2.39.5
> 
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH] tf-a: add current hash of v2.12 archive from Github

[Ahmad Fatoum]

On 07.01.25 12:19, Roland Hieber wrote:
> On Tue, Dec 17, 2024 at 09:25:37AM +0100, Ahmad Fatoum wrote:
>> Downloading the current release manually with:
>>
>>   curl -L 'https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags/v2.12.tar.gz' | md5sum
>>
>> confirms that the hash has changed:
>>
>>   5b90a1c21210702e64234a2beb79f23a  -
>>
>> I am unsure why, but to fix build breakage, let's list both hashes as
>> after extraction of both archives, the contents were found to be
>> completely identical.
> 
> Have you tried diffoscope? I don't have the old tarball, but sometimes the date
> in the tar header differs when archives are re-packed by git.

Good idea. I was lucky and still had the old tarball lying around.

The difference is that the old tarball had a top-level directory
named trusted-firmware-a-2.12 and the old one calls it
arm-trusted-firmware-2.12.

I am not sure what caused this rename, but apparently PTXdist
doesn't mind what the top-level directory is called when extracting.

Cheers,
Ahmad

> 
>  - Roland
> 
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>>  configs/platform-v7a/platformconfig | 2 +-
>>  configs/platform-v8a/platformconfig | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
>> index c3acafd25fc9..e10ac93969a2 100644
>> --- a/configs/platform-v7a/platformconfig
>> +++ b/configs/platform-v7a/platformconfig
>> @@ -207,7 +207,7 @@ PTXCONF_TF_A_STM32MP13=y
>>  PTXCONF_TF_A=y
>>  PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
>>  PTXCONF_TF_A_VERSION="v2.12"
>> -PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
>> +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
>>  PTXCONF_TF_A_ARCH_STRING="aarch32"
>>  PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y
>>  # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set
>> diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
>> index 69e8d5e0696e..0c7d3b7b6b59 100644
>> --- a/configs/platform-v8a/platformconfig
>> +++ b/configs/platform-v8a/platformconfig
>> @@ -207,7 +207,7 @@ PTXCONF_BOOTLOADER=y
>>  PTXCONF_TF_A=y
>>  PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
>>  PTXCONF_TF_A_VERSION="v2.12"
>> -PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46"
>> +PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
>>  PTXCONF_TF_A_ARCH_STRING="aarch64"
>>  PTXCONF_TF_A_ARM_ARCH_MAJOR_8=y
>>  PTXCONF_TF_A_ARM_ARCH_MAJOR=8
>> -- 
>> 2.39.5
>>
>>
>>
> 


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH] tf-a: add current hash of v2.12 archive from Github

[Roland Hieber]

On Tue, Jan 07, 2025 at 12:30:47PM +0100, Ahmad Fatoum wrote:
> On 07.01.25 12:19, Roland Hieber wrote:
> > On Tue, Dec 17, 2024 at 09:25:37AM +0100, Ahmad Fatoum wrote:
> >> Downloading the current release manually with:
> >>
> >>   curl -L 'https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags/v2.12.tar.gz' | md5sum
> >>
> >> confirms that the hash has changed:
> >>
> >>   5b90a1c21210702e64234a2beb79f23a  -
> >>
> >> I am unsure why, but to fix build breakage, let's list both hashes as
> >> after extraction of both archives, the contents were found to be
> >> completely identical.
> > 
> > Have you tried diffoscope? I don't have the old tarball, but sometimes the date
> > in the tar header differs when archives are re-packed by git.
> 
> Good idea. I was lucky and still had the old tarball lying around.
> 
> The difference is that the old tarball had a top-level directory
> named trusted-firmware-a-2.12 and the old one calls it
> arm-trusted-firmware-2.12.
> 
> I am not sure what caused this rename, but apparently PTXdist
> doesn't mind what the top-level directory is called when extracting.

Ah! git-archive is smart and sets the date in the tarball header to the date of
the commitish from which it builds the tarball, and thus produces reproducable
tarballs. But it takes the first folder part from the name of the git
repository, and in DistroKit commit 3e11c53d98c0b (2024-04-24, "tf-a: Change
download URL") the download URL was changed from
"https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git" to the current
"https://github.com/ARM-software/arm-trusted-firmware/", which changed that
name.

PTXdist doesn't care as it creates the source folder with the name $(TF_A_DIR),
and extracts the tarball inside it by skipping the first folder part (tar's
--strip-components parameter, which is set to $(TF_A_STRIP_LEVEL), which
defaults to 1).

 - Roland

-- 
Roland Hieber, Pengutronix e.K.          | rhi@pengutronix.de          |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |