From 97a2823013c63b83ec6dce4a1b2deed53ba89ed2 Mon Sep 17 00:00:00 2001 From: ChinYikMing Date: Thu, 16 May 2024 00:57:35 +0800 Subject: [PATCH] Bump buildroot and binutils version to stable tag The stable tag of buildroot is 2024.02.x currently. Thus, upgrade the default buildroot version of 2023.11.x to 2024.02.x . The commit 1391c99 in branch 2024.02.x of buildroot dropped the support of 2.38.x series of binutils, set the default version to 2.40.x and addded support of version 2.41.x. To ensure the compliance, upgrade the version of binutils in the default configuration of buildroot. This commit also fix the bumping to the wrong version of binutils in commit 2c1e29c. --- configs/buildroot.config | 2 +- scripts/build-image.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/buildroot.config b/configs/buildroot.config index 69a51fb..5b83330 100644 --- a/configs/buildroot.config +++ b/configs/buildroot.config @@ -22,7 +22,7 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_TOOLCHAIN_BUILDROOT_LIBC="glibc" # BR2_TOOLCHAIN_BUILDROOT_CXX is not set BR2_KERNEL_HEADERS_6_1=y -BR2_BINUTILS_VERSION_2_42_X=y +BR2_BINUTILS_VERSION_2_41_X=y # BR2_BINUTILS_GPROFNG is not set BR2_GCC_VERSION_12_X=y BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-softfloat" diff --git a/scripts/build-image.sh b/scripts/build-image.sh index cb8f3c1..5e5c82c 100755 --- a/scripts/build-image.sh +++ b/scripts/build-image.sh @@ -21,7 +21,7 @@ PARALLEL="-j$(nproc)" function do_buildroot { - ASSERT git clone https://github.com/buildroot/buildroot -b 2023.11.x --depth=1 + ASSERT git clone https://github.com/buildroot/buildroot -b 2024.02.x --depth=1 cp -f configs/buildroot.config buildroot/.config cp -f configs/busybox.config buildroot/busybox.config # Otherwise, the error below raises: