[Buildroot] [PATCH 1/1] configs/spike_riscv64: bump kernel to 6.6.35 and add hashes

[Buildroot] [PATCH 1/1] configs/spike_riscv64: bump kernel to 6.6.35 and add hashes

[Julien Olivain]

Commit [1] introduced a new spike_riscv32_defconfig with Kernel
at v6.6.35.

This commit bumps the Kernel of spike_riscv64_defconfig to have it
aligned with its 32bit counterpart.

This commit also adds custom hashes. Therefore, it adds
BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in the defconfig, adds a global
patch directory, and removes the entry in ".checkpackageignore".

Finally, to completely align with the spike_riscv32_defconfig, the
config directive BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM is moved by few
lines.

With this commit, the maintenance of the two spike_riscv{32,64}
defconfigs will be easier.

[1] https://gitlab.com/buildroot.org/buildroot/-/commit/a83ab3f4c8621dec58dc78a8dcb48e519377ac3d

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 .checkpackageignore                                         | 1 -
 .../spike/riscv64/patches/linux-headers/linux-headers.hash  | 1 +
 board/spike/riscv64/patches/linux/linux.hash                | 2 ++
 board/spike/riscv64/patches/opensbi/opensbi.hash            | 2 ++
 configs/spike_riscv64_defconfig                             | 6 ++++--
 5 files changed, 9 insertions(+), 3 deletions(-)
 create mode 120000 board/spike/riscv64/patches/linux-headers/linux-headers.hash
 create mode 100644 board/spike/riscv64/patches/linux/linux.hash
 create mode 100644 board/spike/riscv64/patches/opensbi/opensbi.hash

diff --git a/.checkpackageignore b/.checkpackageignore
index 2c0f265d96..be51c16e36 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -282,7 +282,6 @@ configs/socrates_cyclone5_defconfig lib_defconfig.ForceCheckHash
 configs/solidrun_clearfog_defconfig lib_defconfig.ForceCheckHash
 configs/solidrun_clearfog_gt_8k_defconfig lib_defconfig.ForceCheckHash
 configs/solidrun_macchiatobin_defconfig lib_defconfig.ForceCheckHash
-configs/spike_riscv64_defconfig lib_defconfig.ForceCheckHash
 configs/stm32mp157c_dk2_defconfig lib_defconfig.ForceCheckHash
 configs/stm32mp157c_odyssey_defconfig lib_defconfig.ForceCheckHash
 configs/terasic_de10nano_cyclone5_defconfig lib_defconfig.ForceCheckHash
diff --git a/board/spike/riscv64/patches/linux-headers/linux-headers.hash b/board/spike/riscv64/patches/linux-headers/linux-headers.hash
new file mode 120000
index 0000000000..5808d92afe
--- /dev/null
+++ b/board/spike/riscv64/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file
diff --git a/board/spike/riscv64/patches/linux/linux.hash b/board/spike/riscv64/patches/linux/linux.hash
new file mode 100644
index 0000000000..a3b67a09a4
--- /dev/null
+++ b/board/spike/riscv64/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256  fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e  linux-6.6.35.tar.xz
diff --git a/board/spike/riscv64/patches/opensbi/opensbi.hash b/board/spike/riscv64/patches/opensbi/opensbi.hash
new file mode 100644
index 0000000000..bc4058abe6
--- /dev/null
+++ b/board/spike/riscv64/patches/opensbi/opensbi.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1  opensbi-1.4.tar.gz
diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig
index fa8cba4275..feb13d84db 100644
--- a/configs/spike_riscv64_defconfig
+++ b/configs/spike_riscv64_defconfig
@@ -1,10 +1,12 @@
 BR2_riscv=y
 BR2_RISCV_64=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_GLOBAL_PATCH_DIR="board/spike/riscv64/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.26"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.35"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 BR2_TARGET_ROOTFS_CPIO=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_OPENSBI=y
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] configs/spike_riscv64: bump kernel to 6.6.35 and add hashes

[Thomas Petazzoni via buildroot]

On Fri, 12 Jul 2024 20:39:31 +0200
Julien Olivain <ju.o@free.fr> wrote:

> Commit [1] introduced a new spike_riscv32_defconfig with Kernel
> at v6.6.35.
> 
> This commit bumps the Kernel of spike_riscv64_defconfig to have it
> aligned with its 32bit counterpart.
> 
> This commit also adds custom hashes. Therefore, it adds
> BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in the defconfig, adds a global
> patch directory, and removes the entry in ".checkpackageignore".
> 
> Finally, to completely align with the spike_riscv32_defconfig, the
> config directive BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM is moved by few
> lines.
> 
> With this commit, the maintenance of the two spike_riscv{32,64}
> defconfigs will be easier.
> 
> [1] https://gitlab.com/buildroot.org/buildroot/-/commit/a83ab3f4c8621dec58dc78a8dcb48e519377ac3d
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
>  .checkpackageignore                                         | 1 -
>  .../spike/riscv64/patches/linux-headers/linux-headers.hash  | 1 +
>  board/spike/riscv64/patches/linux/linux.hash                | 2 ++
>  board/spike/riscv64/patches/opensbi/opensbi.hash            | 2 ++
>  configs/spike_riscv64_defconfig                             | 6 ++++--
>  5 files changed, 9 insertions(+), 3 deletions(-)
>  create mode 120000 board/spike/riscv64/patches/linux-headers/linux-headers.hash
>  create mode 100644 board/spike/riscv64/patches/linux/linux.hash
>  create mode 100644 board/spike/riscv64/patches/opensbi/opensbi.hash

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot