Re: [Buildroot] [PATCH] configs/aarch64_efi: bump Linux to 6.10.12

[Julien Olivain <ju.o@free.fr>]

Hi Vincent, All,

Thank you for the patch!

On 01/10/2024 18:26, Vincent Stehlé wrote:
> While at it:
> - Turn on hashes verification and add a hash for the Linux kernel.
> - Shuffle the config a bit to better match the `make savedefconfig' 
> order
>   and remove redundant BR2_TARGET_GRUB2_ARM64_EFI configuration.

During the last Buildroot dev days, it was decided that Buildroot
defconfigs should now be saved in the format generated by "make
savedefconfig" (without any added comments). See for example [1]. Even
if [1] is not merged yet, maybe you could change it directly in that
format?

> - Fix shellcheck warnings in our post-image script and update
>   .checkpackageignore.
> 
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Erico Nunes <nunes.erico@gmail.com>
> Cc: Dick Olsson <hi@senzilla.io>
> ---
> 
> 
> Hi,
> 
> This has been tested on:
> - Qemu (U-Boot & EDK II)
> - FVP (U-Boot)
> - Board (U-Boot)
> 
> Best regards,
> Vincent.
> 
> 
>  .checkpackageignore                           |  2 --
>  .../patches/linux-headers/linux-headers.hash  |  1 +
>  board/aarch64-efi/patches/linux/linux.hash    |  2 ++
>  board/aarch64-efi/post-image.sh               |  4 +--
>  configs/aarch64_efi_defconfig                 | 35 ++++++++++---------
>  5 files changed, 23 insertions(+), 21 deletions(-)
>  create mode 120000 
> board/aarch64-efi/patches/linux-headers/linux-headers.hash
>  create mode 100644 board/aarch64-efi/patches/linux/linux.hash
> 
> diff --git a/.checkpackageignore b/.checkpackageignore
> index 0cc742bf09..fed8a5c2b6 100644
> --- a/.checkpackageignore
> +++ b/.checkpackageignore
> @@ -1,4 +1,3 @@
> -board/aarch64-efi/post-image.sh Shellcheck
>  board/amarula/vyasa/post-build.sh Shellcheck
>  
> board/andes/ae350/patches/uboot/0001-mmc-ftsdc010_mci-Support-DTS-of-ftsdc010-driver-for-.patch 
> lib_patch.Upstream
>  
> board/andes/ae350/patches/uboot/0002-spl-Align-device-tree-blob-address-at-8-byte-boundar.patch 
> lib_patch.Upstream
> @@ -106,7 +105,6 @@ 
> boot/syslinux/0013-Fix-build-with-gnu-efi-version-3.0.9.patch 
> lib_patch.Upstream
>  
> boot/syslinux/0014-Fix-build-with-binutils-note-gnu-property-section.patch 
> lib_patch.Upstream
>  
> boot/syslinux/0016-Workaround-multiple-definition-of-symbol-errors.patch 
> lib_patch.Upstream
>  
> boot/syslinux/0017-Replace-builtin-strlen-that-appears-to-get-optimized.patch 
> lib_patch.Upstream
> -configs/aarch64_efi_defconfig lib_defconfig.ForceCheckHash
>  configs/am574x_idk_defconfig lib_defconfig.ForceCheckHash
>  configs/andes_ae350_45_defconfig lib_defconfig.ForceCheckHash
>  configs/arcturus_ucls1012a_defconfig lib_defconfig.ForceCheckHash
> diff --git a/board/aarch64-efi/patches/linux-headers/linux-headers.hash 
> b/board/aarch64-efi/patches/linux-headers/linux-headers.hash
> new file mode 120000
> index 0000000000..5808d92afe
> --- /dev/null
> +++ b/board/aarch64-efi/patches/linux-headers/linux-headers.hash
> @@ -0,0 +1 @@
> +../linux/linux.hash
> \ No newline at end of file
> diff --git a/board/aarch64-efi/patches/linux/linux.hash 
> b/board/aarch64-efi/patches/linux/linux.hash
> new file mode 100644
> index 0000000000..20941a269b
> --- /dev/null
> +++ b/board/aarch64-efi/patches/linux/linux.hash
> @@ -0,0 +1,2 @@
> +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
> +sha256  
> 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf  
> linux-6.10.12.tar.xz
> diff --git a/board/aarch64-efi/post-image.sh 
> b/board/aarch64-efi/post-image.sh
> index f0214dc866..1aef15ef6f 100755
> --- a/board/aarch64-efi/post-image.sh
> +++ b/board/aarch64-efi/post-image.sh
> @@ -1,5 +1,5 @@
>  #!/bin/sh
> 
> -BOARD_DIR="$(dirname $0)"
> +BOARD_DIR=$(dirname "$0")
> 
> -cp -f ${BOARD_DIR}/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
> +cp -f "${BOARD_DIR}/grub.cfg" 
> "${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg"
> diff --git a/configs/aarch64_efi_defconfig 
> b/configs/aarch64_efi_defconfig
> index 443113e47b..d9959176bd 100644
> --- a/configs/aarch64_efi_defconfig
> +++ b/configs/aarch64_efi_defconfig
> @@ -1,34 +1,35 @@
>  # Architecture
>  BR2_aarch64=y
> 
> +# Hashes
> +BR2_GLOBAL_PATCH_DIR="board/aarch64-efi/patches"
> +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y
> +
>  # System
>  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
> -
> -## Required tools to create bootable media
> -BR2_PACKAGE_HOST_GENIMAGE=y
> -
> -# Bootloader
> -BR2_TARGET_GRUB2=y
> -BR2_TARGET_GRUB2_ARM64_EFI=y
> -
> -# Filesystem / image
> -BR2_TARGET_ROOTFS_EXT2=y
> -BR2_TARGET_ROOTFS_EXT2_4=y
> -BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
> -# BR2_TARGET_ROOTFS_TAR is not set
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh 
> support/scripts/genimage.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg"
> 
> -# Linux headers same as kernel, a 5.15 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
> +# Linux headers same as kernel, a 6.10 series
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y
> 
>  # Kernel
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.4"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12"

Also, for correctness, since this patch updates to a 6.10 series and
is using the Kernel arm64 defconfig, this Buildroot defconfig might
need to set BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y introduced in [2].

>  BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
>  BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
> 
> -# Host tools for genimage
> +# Filesystem
> +BR2_TARGET_ROOTFS_EXT2=y
> +BR2_TARGET_ROOTFS_EXT2_4=y
> +BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
> +# BR2_TARGET_ROOTFS_TAR is not set
> +
> +# Bootloader
> +BR2_TARGET_GRUB2=y
> +
> +# Host tools for genimage to create bootable media
>  BR2_PACKAGE_HOST_DOSFSTOOLS=y
> +BR2_PACKAGE_HOST_GENIMAGE=y
>  BR2_PACKAGE_HOST_MTOOLS=y
> --
> 2.45.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

Best regards,

Julien.

[1] 
https://patchwork.ozlabs.org/project/buildroot/patch/1d932c6a7a86126b8a8bce3babe997ad84e3ccfb.1726936373.git.yann.morin.1998@free.fr/
[2] 
https://gitlab.com/buildroot.org/buildroot/-/commit/abce4a2b365276a7fa081d327289e5e6d8bdca7e
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot