diff mbox series

[1/2] configs/olimex_imx233_olinuxino: bump Linux and U-Boot

Message ID 20240505115152.24857-1-francois.perrad@gadz.org
State Changes Requested
Headers show
Series [1/2] configs/olimex_imx233_olinuxino: bump Linux and U-Boot | expand

Commit Message

Francois Perrad May 5, 2024, 11:51 a.m. UTC
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 configs/olimex_imx233_olinuxino_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Yann E. MORIN May 5, 2024, 1:02 p.m. UTC | #1
François, All,

Thanks for this patch.

We've started to add hashes for custom versions, in an attempts to close
off CVE-2023-43608.

See recent changes for inspiration:
    5efa5e9023 configs/armadeus_apf27: add hashes for Linux/U-Boot
    99a3698729 configs/nezha_defconfig: add hashes for Linux/opensbi/u-boot
    2915879c15 configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18
    dde89fe703 configs/lafrite_defconfig: bump kernel to 6.6.22
    9ebbfeff38 configs/rock5b: add hash for custom kernel

This is a relatively new requirement, though, and we're not yet all so
careful to check for that when we apply defconfig updates, but we do
have a new check for that, see:
    7931f78c16 utils/check-package: new check for Buildroot's defconfig files

However, since there currently are explicit exclusions, just running
"make check-package" will not catch the issue when updating existing
defconfigs, just when adding new ones.

Could you look into providing such hash files for this defconfig, please?

Regards,
Yann E. MORIN.

On 2024-05-05 13:51 +0200, Francois Perrad spake thusly:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  configs/olimex_imx233_olinuxino_defconfig | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig
> index 275dd98af..647292899 100644
> --- a/configs/olimex_imx233_olinuxino_defconfig
> +++ b/configs/olimex_imx233_olinuxino_defconfig
> @@ -2,8 +2,8 @@
>  BR2_arm=y
>  BR2_arm926t=y
>  
> -# Linux headers same as kernel, a 5.4 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
> +# Linux headers same as kernel, a 6.1 series
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
>  
>  # System
>  BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
> @@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
>  # Kernel
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
> -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8"
> +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.83"
>  BR2_LINUX_KERNEL_DEFCONFIG="mxs"
>  BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
> @@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
>  BR2_TARGET_UBOOT=y
>  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
>  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
> -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
> +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04"
>  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino"
>  BR2_TARGET_UBOOT_FORMAT_SD=y
>   
> -- 
> 2.40.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/configs/olimex_imx233_olinuxino_defconfig b/configs/olimex_imx233_olinuxino_defconfig
index 275dd98af..647292899 100644
--- a/configs/olimex_imx233_olinuxino_defconfig
+++ b/configs/olimex_imx233_olinuxino_defconfig
@@ -2,8 +2,8 @@ 
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 5.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
@@ -14,7 +14,7 @@  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.83"
 BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -40,7 +40,7 @@  BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino"
 BR2_TARGET_UBOOT_FORMAT_SD=y