From 7880f89a6ad3216cd3c4dbd8cd30e76a554fa881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Wed, 2 Oct 2024 13:22:34 +0200 Subject: [PATCH] configs/aarch64_efi: bump Linux to 6.10.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While at it: - Turn on hashes verification and add a hash for the Linux kernel. - Linux kernel needs host-python3; add it. - Convert to `make savedefconfig' format. - Fix shellcheck warnings in our post-image script and update .checkpackageignore. Signed-off-by: Vincent Stehlé Cc: Erico Nunes Cc: Dick Olsson Cc: Julien Olivain Reviewed-by: Julien Olivain [Julien: rebased the patch to resolve conflicts with commit edc0a6b1a "configs: regenerate all defconfigs"] Signed-off-by: Julien Olivain --- .checkpackageignore | 2 -- board/aarch64-efi/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 | 7 +++++-- 5 files changed, 10 insertions(+), 6 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 207d72fd20..f38b900735 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 @@ -104,7 +103,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 f322f04c66..9f284ff74b 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -1,13 +1,16 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_GLOBAL_PATCH_DIR="board/aarch64-efi/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y 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" 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" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y 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="200M"