diff mbox series

[1/3] configs/armadeus_apf27: add hashes for Linux/U-Boot

Message ID 20240503154856.763551-1-julien.boibessot@armadeus.com
State Accepted
Headers show
Series [1/3] configs/armadeus_apf27: add hashes for Linux/U-Boot | expand

Commit Message

Julien BOIBESSOT May 3, 2024, 3:48 p.m. UTC
And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. As asked By Romain.

Signed-off-by: Julien BOIBESSOT <julien.boibessot@armadeus.com>
---
 board/armadeus/patches/linux-headers/linux-headers.hash | 1 +
 board/armadeus/patches/linux/linux.hash                 | 2 ++
 board/armadeus/patches/uboot/uboot.hash                 | 2 ++
 configs/armadeus_apf27_defconfig                        | 4 ++++
 4 files changed, 9 insertions(+)
 create mode 120000 board/armadeus/patches/linux-headers/linux-headers.hash
 create mode 100644 board/armadeus/patches/linux/linux.hash
 create mode 100644 board/armadeus/patches/uboot/uboot.hash

Comments

Yann E. MORIN May 5, 2024, 8:38 a.m. UTC | #1
Julien, All,

On 2024-05-03 17:48 +0200, Julien BOIBESSOT spake thusly:
> And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. As asked By Romain.

    $ ./utils/docker-run make check-package
    configs/armadeus_apf27_defconfig:0: lib_defconfig.ForceCheckHash was expected to fail, did you fix the file and forget to update .checkpackageignore?
    configs/armadeus_apf28_defconfig:0: lib_defconfig.ForceCheckHash was expected to fail, did you fix the file and forget to update .checkpackageignore?
    configs/armadeus_apf51_defconfig:0: lib_defconfig.ForceCheckHash was expected to fail, did you fix the file and forget to update .checkpackageignore?

I've fixed that in each corresponding patch.

Series applied to master, thanks.

Regards,
Yann E. MORIN.

> Signed-off-by: Julien BOIBESSOT <julien.boibessot@armadeus.com>
> ---
>  board/armadeus/patches/linux-headers/linux-headers.hash | 1 +
>  board/armadeus/patches/linux/linux.hash                 | 2 ++
>  board/armadeus/patches/uboot/uboot.hash                 | 2 ++
>  configs/armadeus_apf27_defconfig                        | 4 ++++
>  4 files changed, 9 insertions(+)
>  create mode 120000 board/armadeus/patches/linux-headers/linux-headers.hash
>  create mode 100644 board/armadeus/patches/linux/linux.hash
>  create mode 100644 board/armadeus/patches/uboot/uboot.hash
> 
> diff --git a/board/armadeus/patches/linux-headers/linux-headers.hash b/board/armadeus/patches/linux-headers/linux-headers.hash
> new file mode 120000
> index 0000000000..5808d92afe
> --- /dev/null
> +++ b/board/armadeus/patches/linux-headers/linux-headers.hash
> @@ -0,0 +1 @@
> +../linux/linux.hash
> \ No newline at end of file
> diff --git a/board/armadeus/patches/linux/linux.hash b/board/armadeus/patches/linux/linux.hash
> new file mode 100644
> index 0000000000..804920c10d
> --- /dev/null
> +++ b/board/armadeus/patches/linux/linux.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256  879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9  linux-5.10.215.tar.xz
> diff --git a/board/armadeus/patches/uboot/uboot.hash b/board/armadeus/patches/uboot/uboot.hash
> new file mode 100644
> index 0000000000..777e0adab2
> --- /dev/null
> +++ b/board/armadeus/patches/uboot/uboot.hash
> @@ -0,0 +1,2 @@
> +# Locally computed
> +sha256  839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268  u-boot-2018.09.tar.bz2
> diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig
> index a87d319729..782587e410 100644
> --- a/configs/armadeus_apf27_defconfig
> +++ b/configs/armadeus_apf27_defconfig
> @@ -5,6 +5,10 @@ BR2_arm926t=y
>  # Linux headers same as kernel, a 5.10 series
>  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>  
> +# Build
> +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches"
> +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> +
>  # System
>  BR2_TARGET_GENERIC_HOSTNAME="apf27"
>  BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Julien BOIBESSOT May 5, 2024, 8:07 p.m. UTC | #2
Yann,

Le 2024-05-05 10:38, Yann E. MORIN a écrit :
> Julien, All,
> 
> On 2024-05-03 17:48 +0200, Julien BOIBESSOT spake thusly:
>> And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. As asked By Romain.
> 
>     $ ./utils/docker-run make check-package
>     configs/armadeus_apf27_defconfig:0: lib_defconfig.ForceCheckHash
> was expected to fail, did you fix the file and forget to update
> .checkpackageignore?
>     configs/armadeus_apf28_defconfig:0: lib_defconfig.ForceCheckHash
> was expected to fail, did you fix the file and forget to update
> .checkpackageignore?
>     configs/armadeus_apf51_defconfig:0: lib_defconfig.ForceCheckHash
> was expected to fail, did you fix the file and forget to update
> .checkpackageignore?
> 
> I've fixed that in each corresponding patch.
> 

Thanks for the fix ! I also saw the messages when running "make 
check-package" but didn't know if it was my job or not to fix 
.checkpackageignore file.
Is there any documentation on what I was supposed to do ?

Best regards,

Julien

> Series applied to master, thanks.
> 
> Regards,
> Yann E. MORIN.
> 
>> Signed-off-by: Julien BOIBESSOT <julien.boibessot@armadeus.com>
>> ---
>>  board/armadeus/patches/linux-headers/linux-headers.hash | 1 +
>>  board/armadeus/patches/linux/linux.hash                 | 2 ++
>>  board/armadeus/patches/uboot/uboot.hash                 | 2 ++
>>  configs/armadeus_apf27_defconfig                        | 4 ++++
>>  4 files changed, 9 insertions(+)
>>  create mode 120000 
>> board/armadeus/patches/linux-headers/linux-headers.hash
>>  create mode 100644 board/armadeus/patches/linux/linux.hash
>>  create mode 100644 board/armadeus/patches/uboot/uboot.hash
>> 
>> diff --git a/board/armadeus/patches/linux-headers/linux-headers.hash 
>> b/board/armadeus/patches/linux-headers/linux-headers.hash
>> new file mode 120000
>> index 0000000000..5808d92afe
>> --- /dev/null
>> +++ b/board/armadeus/patches/linux-headers/linux-headers.hash
>> @@ -0,0 +1 @@
>> +../linux/linux.hash
>> \ No newline at end of file
>> diff --git a/board/armadeus/patches/linux/linux.hash 
>> b/board/armadeus/patches/linux/linux.hash
>> new file mode 100644
>> index 0000000000..804920c10d
>> --- /dev/null
>> +++ b/board/armadeus/patches/linux/linux.hash
>> @@ -0,0 +1,2 @@
>> +# Locally calculated
>> +sha256  
>> 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9  
>> linux-5.10.215.tar.xz
>> diff --git a/board/armadeus/patches/uboot/uboot.hash 
>> b/board/armadeus/patches/uboot/uboot.hash
>> new file mode 100644
>> index 0000000000..777e0adab2
>> --- /dev/null
>> +++ b/board/armadeus/patches/uboot/uboot.hash
>> @@ -0,0 +1,2 @@
>> +# Locally computed
>> +sha256  
>> 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268  
>> u-boot-2018.09.tar.bz2
>> diff --git a/configs/armadeus_apf27_defconfig 
>> b/configs/armadeus_apf27_defconfig
>> index a87d319729..782587e410 100644
>> --- a/configs/armadeus_apf27_defconfig
>> +++ b/configs/armadeus_apf27_defconfig
>> @@ -5,6 +5,10 @@ BR2_arm926t=y
>>  # Linux headers same as kernel, a 5.10 series
>>  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
>> 
>> +# Build
>> +BR2_GLOBAL_PATCH_DIR="board/armadeus/patches"
>> +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
>> +
>>  # System
>>  BR2_TARGET_GENERIC_HOSTNAME="apf27"
>>  BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
>> --
>> 2.25.1
>> 
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
Yann E. MORIN May 5, 2024, 8:40 p.m. UTC | #3
Julien, All,

On 2024-05-05 22:07 +0200, julien.boibessot@armadeus.com spake thusly:
> Le 2024-05-05 10:38, Yann E. MORIN a écrit :
> > Julien, All,
> > On 2024-05-03 17:48 +0200, Julien BOIBESSOT spake thusly:
> > > And enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. As asked By Romain.
> >     $ ./utils/docker-run make check-package
> >     configs/armadeus_apf27_defconfig:0: lib_defconfig.ForceCheckHash
> > was expected to fail, did you fix the file and forget to update
> > .checkpackageignore?
[--SNIP--]
> Thanks for the fix ! I also saw the messages when running "make
> check-package" but didn't know if it was my job or not to fix
> .checkpackageignore file.

Entries in .checkpackageignore means that those files are exempleted
from the associated tests. Presumably, those files pre-existed
check-package, and thus we did not want to fail for those, so we
excluded them.

So, when a file is fixed, the corresponding exclusion must be removed.

In this case, you fixed the lib_defconfig.ForceCheckHash test, so now it
no longer fails, but it was expected to fail. so the correct solution is
indeed for you to state "yes, I fixed it, so it is no longer excluded!".

> Is there any documentation on what I was supposed to do ?

Err... Joker.

Thanks!

Regards,
Yann E. MORIN.
diff mbox series

Patch

diff --git a/board/armadeus/patches/linux-headers/linux-headers.hash b/board/armadeus/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/armadeus/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@ 
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/armadeus/patches/linux/linux.hash b/board/armadeus/patches/linux/linux.hash
new file mode 100644
index 0000000000..804920c10d
--- /dev/null
+++ b/board/armadeus/patches/linux/linux.hash
@@ -0,0 +1,2 @@ 
+# Locally calculated
+sha256  879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9  linux-5.10.215.tar.xz
diff --git a/board/armadeus/patches/uboot/uboot.hash b/board/armadeus/patches/uboot/uboot.hash
new file mode 100644
index 0000000000..777e0adab2
--- /dev/null
+++ b/board/armadeus/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@ 
+# Locally computed
+sha256  839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268  u-boot-2018.09.tar.bz2
diff --git a/configs/armadeus_apf27_defconfig b/configs/armadeus_apf27_defconfig
index a87d319729..782587e410 100644
--- a/configs/armadeus_apf27_defconfig
+++ b/configs/armadeus_apf27_defconfig
@@ -5,6 +5,10 @@  BR2_arm926t=y
 # Linux headers same as kernel, a 5.10 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 
+# Build
+BR2_GLOBAL_PATCH_DIR="board/armadeus/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
+
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"