From 36f8a0eba7bdd464add43b8dc706c3739db00997 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 21 Sep 2025 23:50:59 +0800 Subject: [PATCH] configs/pc_x86_64_{bios, efi}_defconfig: switch to kernel 6.12.47 LTS This commit adds BR2_DOWNLOAD_FORCE_CHECK_HASHES=y in the defconfig and adds custom hash files. The exception entry in .checkpackageignore is also removed. Signed-off-by: Scott Fan [Julien: change linux.hash comment to reuse hash from upstream] Signed-off-by: Julien Olivain --- .checkpackageignore | 2 -- board/pc/patches/linux-headers/linux-headers.hash | 1 + board/pc/patches/linux/linux.hash | 2 ++ configs/pc_x86_64_bios_defconfig | 6 ++++-- configs/pc_x86_64_efi_defconfig | 6 ++++-- 5 files changed, 11 insertions(+), 6 deletions(-) create mode 120000 board/pc/patches/linux-headers/linux-headers.hash create mode 100644 board/pc/patches/linux/linux.hash diff --git a/.checkpackageignore b/.checkpackageignore index e28db178c7..12d11f677b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -162,8 +162,6 @@ configs/olpc_xo175_defconfig lib_defconfig.ForceCheckHash configs/olpc_xo1_defconfig lib_defconfig.ForceCheckHash configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_plus_defconfig lib_defconfig.ForceCheckHash -configs/pc_x86_64_bios_defconfig lib_defconfig.ForceCheckHash -configs/pc_x86_64_efi_defconfig lib_defconfig.ForceCheckHash configs/pine64_defconfig lib_defconfig.ForceCheckHash configs/pine64_pinecube_defconfig lib_defconfig.ForceCheckHash configs/pine64_star64_defconfig lib_defconfig.ForceCheckHash diff --git a/board/pc/patches/linux-headers/linux-headers.hash b/board/pc/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/pc/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/pc/patches/linux/linux.hash b/board/pc/patches/linux/linux.hash new file mode 100644 index 0000000000..bf565408ee --- /dev/null +++ b/board/pc/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 e82fe40871743048226987bd349ef107168b15aab90140e872ca4ed470922e25 linux-6.12.47.tar.xz diff --git a/configs/pc_x86_64_bios_defconfig b/configs/pc_x86_64_bios_defconfig index 3617d3a85f..3b3e4cc561 100644 --- a/configs/pc_x86_64_bios_defconfig +++ b/configs/pc_x86_64_bios_defconfig @@ -1,5 +1,7 @@ BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/pc/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" @@ -7,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y diff --git a/configs/pc_x86_64_efi_defconfig b/configs/pc_x86_64_efi_defconfig index 45d895889b..a126eb8338 100644 --- a/configs/pc_x86_64_efi_defconfig +++ b/configs/pc_x86_64_efi_defconfig @@ -1,12 +1,14 @@ BR2_x86_64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12=y +BR2_GLOBAL_PATCH_DIR="board/pc/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_ROOTFS_POST_BUILD_SCRIPT="board/pc/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image-efi.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.24" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.47" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config" BR2_LINUX_KERNEL_INSTALL_TARGET=y