configs/rockpro64: bump Linux kernel, U-Boot and TF-A

- Bump Linux kernel to v6.10.14 and add the dependency on host python3.
- Bump U-Boot to v2024.10 and add the dependency on GnuTLS and
  util-linux (for uuid).
- Bump TF-A to v2.11.
- Turn on hashes verification and add hashes for the Linux kernel and
  U-Boot.
- Fix shellcheck warnings in the post-build script.
- Remove the related exceptions in .checkpackageignore.

Signed-off-by: Vincent Stehlé <[email protected]>
Cc: Jagan Teki <[email protected]>
Cc: Suniel Mahesh <[email protected]>
Cc: Giulio Benetti <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>

diff --git a/.checkpackageignore b/.checkpackageignore
index f38b900735b3c857c974ce01d5ab022024c8fc69..fbebf404d60b4cea2aa32f90465021d996106b46 100644 (file)
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -63,7 +63,6 @@ board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-sp
 board/orangepi/orangepi-zero/patches/linux/0004-ARM-dts-orange-pi-zero-enable-uart.patch lib_patch.Upstream
 board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch lib_patch.Upstream
 board/pine64/rock64/post-build.sh Shellcheck
-board/pine64/rockpro64/post-build.sh Shellcheck
 board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck
 board/qemu/x86/post-build.sh Shellcheck
 board/qemu/x86_64/post-build.sh Shellcheck
@@ -226,7 +225,6 @@ configs/riotboard_defconfig lib_defconfig.ForceCheckHash
 configs/roc_pc_rk3399_defconfig lib_defconfig.ForceCheckHash
 configs/rock64_defconfig lib_defconfig.ForceCheckHash
 configs/rock_pi_n8_defconfig lib_defconfig.ForceCheckHash
-configs/rockpro64_defconfig lib_defconfig.ForceCheckHash
 configs/roseapplepi_defconfig lib_defconfig.ForceCheckHash
 configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash
 configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash

diff --git a/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash b/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash
new file mode 120000 (symlink)
index 0000000..5808d92
--- /dev/null
+++ b/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash
@@ -0,0 +1 @@
+../linux/linux.hash
\ No newline at end of file

diff --git a/board/pine64/rockpro64/patches/linux/linux.hash b/board/pine64/rockpro64/patches/linux/linux.hash
new file mode 100644 (file)
index 0000000..396c18d
--- /dev/null
+++ b/board/pine64/rockpro64/patches/linux/linux.hash
@@ -0,0 +1,2 @@
+# From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256  55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e  linux-6.10.14.tar.xz

diff --git a/board/pine64/rockpro64/patches/uboot/uboot.hash b/board/pine64/rockpro64/patches/uboot/uboot.hash
new file mode 100644 (file)
index 0000000..904fa56
--- /dev/null
+++ b/board/pine64/rockpro64/patches/uboot/uboot.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0  u-boot-2024.10.tar.bz2

diff --git a/board/pine64/rockpro64/post-build.sh b/board/pine64/rockpro64/post-build.sh
index ba29375c05e862c25aec2704e066f5ce73f65392..e947745488b4489193edc555834d51660ad55ec8 100755 (executable)
--- a/board/pine64/rockpro64/post-build.sh
+++ b/board/pine64/rockpro64/post-build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-BOARD_DIR="$(dirname $0)"
+BOARD_DIR=$(dirname "$0")
 
-install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf
+install -m 0644 -D "$BOARD_DIR/extlinux.conf" "$BINARIES_DIR/extlinux/extlinux.conf"

diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig
index d70fd83c03841a78faa5016ff55053014ea00e50..d6c217e9462e2191db1c4e84fe24652c0a67121b 100644 (file)
--- a/configs/rockpro64_defconfig
+++ b/configs/rockpro64_defconfig
@@ -1,6 +1,8 @@
 BR2_aarch64=y
 BR2_cortex_a72_a53=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y
+BR2_GLOBAL_PATCH_DIR="board/pine64/rockpro64/patches"
+BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
 BR2_TARGET_GENERIC_HOSTNAME="rockpro64"
 BR2_TARGET_GENERIC_ISSUE="Welcome to ROCKPRO64"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/rockpro64/post-build.sh"
@@ -8,30 +10,33 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rockpro64/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.14"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9.0"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES=""
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
+BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y