diff mbox series

configs/amarula_vyasa_rk3288_defconfig: add uboot and linux hashes

Message ID 20240524220421.710392-1-giulio.benetti@benettiengineering.com
State Changes Requested
Headers show
Series configs/amarula_vyasa_rk3288_defconfig: add uboot and linux hashes | expand

Commit Message

Giulio Benetti May 24, 2024, 10:04 p.m. UTC
Add BR2_DOWNLOAD_FORCE_CHECK_HASHES and drop defconfig entry in
.checkpackageignore.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 .checkpackageignore                    | 1 -
 boot/uboot/uboot.hash                  | 1 +
 configs/amarula_vyasa_rk3288_defconfig | 1 +
 linux/linux.hash                       | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

Comments

Peter Korsgaard May 25, 2024, 9:45 a.m. UTC | #1
>>>>> "Giulio" == Giulio Benetti <giulio.benetti@benettiengineering.com> writes:

 > Add BR2_DOWNLOAD_FORCE_CHECK_HASHES and drop defconfig entry in
 > .checkpackageignore.

 > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
 > ---
 >  .checkpackageignore                    | 1 -
 >  boot/uboot/uboot.hash                  | 1 +
 >  configs/amarula_vyasa_rk3288_defconfig | 1 +
 >  linux/linux.hash                       | 1 +
 >  4 files changed, 3 insertions(+), 1 deletion(-)

 > diff --git a/.checkpackageignore b/.checkpackageignore
 > index ebf320c3c5..9b9e4a61f9 100644
 > --- a/.checkpackageignore
 > +++ b/.checkpackageignore
 > @@ -122,7 +122,6 @@ configs/acmesystems_aria_g25_256mb_defconfig lib_defconfig.ForceCheckHash
 >  configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash
 >  configs/acmesystems_arietta_g25_256mb_defconfig lib_defconfig.ForceCheckHash
 >  configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash
 > -configs/amarula_vyasa_rk3288_defconfig lib_defconfig.ForceCheckHash
 >  configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash
 >  configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash
 >  configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash
 > diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
 > index a8021fb696..b0ffd7e69d 100644
 > --- a/boot/uboot/uboot.hash
 > +++ b/boot/uboot/uboot.hash
 > @@ -1,3 +1,4 @@
 >  # Locally computed:
 > +sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
 >  sha256  18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a  u-boot-2024.04.tar.bz2
 >  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt

This is not right. You should add the hash to a custom
board/amarula/.../patches/uboot/uboot.hash file, E.G. see commit
459c8c95c7 (configs/orangepi_r1_defconfig: add hashes for
Linux/headers/u-boot) for an exmple.
Giulio Benetti May 25, 2024, 2:08 p.m. UTC | #2
On 25/05/24 11:45, Peter Korsgaard wrote:
>>>>>> "Giulio" == Giulio Benetti <giulio.benetti@benettiengineering.com> writes:
> 
>   > Add BR2_DOWNLOAD_FORCE_CHECK_HASHES and drop defconfig entry in
>   > .checkpackageignore.
> 
>   > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
>   > ---
>   >  .checkpackageignore                    | 1 -
>   >  boot/uboot/uboot.hash                  | 1 +
>   >  configs/amarula_vyasa_rk3288_defconfig | 1 +
>   >  linux/linux.hash                       | 1 +
>   >  4 files changed, 3 insertions(+), 1 deletion(-)
> 
>   > diff --git a/.checkpackageignore b/.checkpackageignore
>   > index ebf320c3c5..9b9e4a61f9 100644
>   > --- a/.checkpackageignore
>   > +++ b/.checkpackageignore
>   > @@ -122,7 +122,6 @@ configs/acmesystems_aria_g25_256mb_defconfig lib_defconfig.ForceCheckHash
>   >  configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash
>   >  configs/acmesystems_arietta_g25_256mb_defconfig lib_defconfig.ForceCheckHash
>   >  configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash
>   > -configs/amarula_vyasa_rk3288_defconfig lib_defconfig.ForceCheckHash
>   >  configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash
>   >  configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash
>   >  configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash
>   > diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
>   > index a8021fb696..b0ffd7e69d 100644
>   > --- a/boot/uboot/uboot.hash
>   > +++ b/boot/uboot/uboot.hash
>   > @@ -1,3 +1,4 @@
>   >  # Locally computed:
>   > +sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
>   >  sha256  18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a  u-boot-2024.04.tar.bz2
>   >  sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
> 
> This is not right. You should add the hash to a custom
> board/amarula/.../patches/uboot/uboot.hash file, E.G. see commit
> 459c8c95c7 (configs/orangepi_r1_defconfig: add hashes for
> Linux/headers/u-boot) for an exmple.
> 

Thank you for pointing, I've misunderstood. I've sent a V2:
https://patchwork.ozlabs.org/project/buildroot/patch/20240525140641.1374683-1-giulio.benetti@benettiengineering.com/
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index ebf320c3c5..9b9e4a61f9 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -122,7 +122,6 @@  configs/acmesystems_aria_g25_256mb_defconfig lib_defconfig.ForceCheckHash
 configs/acmesystems_arietta_g25_128mb_defconfig lib_defconfig.ForceCheckHash
 configs/acmesystems_arietta_g25_256mb_defconfig lib_defconfig.ForceCheckHash
 configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash
-configs/amarula_vyasa_rk3288_defconfig lib_defconfig.ForceCheckHash
 configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash
 configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash
 configs/arcturus_ucp1020_defconfig lib_defconfig.ForceCheckHash
diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash
index a8021fb696..b0ffd7e69d 100644
--- a/boot/uboot/uboot.hash
+++ b/boot/uboot/uboot.hash
@@ -1,3 +1,4 @@ 
 # Locally computed:
+sha256  50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8  u-boot-2022.10.tar.bz2
 sha256  18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a  u-boot-2024.04.tar.bz2
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Licenses/gpl-2.0.txt
diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig
index 0dd47f498f..c88fb761c3 100644
--- a/configs/amarula_vyasa_rk3288_defconfig
+++ b/configs/amarula_vyasa_rk3288_defconfig
@@ -5,6 +5,7 @@  BR2_ARM_FPU_NEON_VFPV4=y
 
 # Linux headers same as kernel, a 6.1 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y
diff --git a/linux/linux.hash b/linux/linux.hash
index af82148e80..0d4de985ab 100644
--- a/linux/linux.hash
+++ b/linux/linux.hash
@@ -2,6 +2,7 @@ 
 sha256  f905f1238ea7a8e85314bacf283302e8097006010d25fcea726d0de0ea5bc9b6  linux-6.8.9.tar.xz
 sha256  b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6  linux-6.6.30.tar.xz
 sha256  83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d  linux-6.1.90.tar.xz
+sha256  880ace63ca2291b8b639e9bd862cc828649d3e1e00ccfee5861473debd2e4dec  linux-6.1.91.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256  f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6  linux-5.15.158.tar.xz
 sha256  e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151  linux-5.10.216.tar.xz