set GCC 13 as external toolchain gcc for recovery system build and

unified 6.6 kernel headers definitions for all defconfigs.
jens-maus · Jun 17, 2024 · 27dc7a8 · 27dc7a8
1 parent c0bba83
commit 27dc7a8
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 13 deletions.
diff --git a/buildroot-external/package/recovery-system/external/Buildroot.config b/buildroot-external/package/recovery-system/external/Buildroot.config
@@ -23,7 +23,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_TOOLCHAIN_EXTERNAL_GCC_12=y
+BR2_TOOLCHAIN_EXTERNAL_GCC_13=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 # BR2_TOOLCHAIN_EXTERNAL_INET_RPC is not set
 BR2_TOOLCHAIN_EXTERNAL_PATH="$(BASE_DIR)/../../../host"
 

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_generic-aarch64.config b/buildroot-external/package/recovery-system/external/configs/recovery_generic-aarch64.config
@@ -1,5 +1,4 @@
 BR2_aarch64=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/generic-aarch64/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_generic-x86_64.config b/buildroot-external/package/recovery-system/external/configs/recovery_generic-x86_64.config
@@ -1,6 +1,5 @@
 BR2_x86_64=y
 BR2_x86_corei7=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/generic-x86_64/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_odroid-c2.config b/buildroot-external/package/recovery-system/external/configs/recovery_odroid-c2.config
@@ -1,5 +1,4 @@
 BR2_aarch64=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/odroid-c2/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_odroid-c4.config b/buildroot-external/package/recovery-system/external/configs/recovery_odroid-c4.config
@@ -1,6 +1,5 @@
 BR2_aarch64=y
 BR2_cortex_a55=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/odroid-c4/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_odroid-n2.config b/buildroot-external/package/recovery-system/external/configs/recovery_odroid-n2.config
@@ -1,6 +1,5 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/odroid-n2/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_ova.config b/buildroot-external/package/recovery-system/external/configs/recovery_ova.config
@@ -1,5 +1,4 @@
 BR2_x86_64=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/ova/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_rpi0.config b/buildroot-external/package/recovery-system/external/configs/recovery_rpi0.config
@@ -1,6 +1,5 @@
 BR2_arm=y
 BR2_arm1176jzf_s=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/rpi0/post-build.sh"
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(BR2_EXTERNAL_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION)"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_rpi2.config b/buildroot-external/package/recovery-system/external/configs/recovery_rpi2.config
@@ -1,6 +1,5 @@
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/rpi2/post-build.sh"
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_rpi3.config b/buildroot-external/package/recovery-system/external/configs/recovery_rpi3.config
@@ -1,6 +1,5 @@
 BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/rpi3/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_rpi4.config b/buildroot-external/package/recovery-system/external/configs/recovery_rpi4.config
@@ -1,6 +1,5 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/rpi4/post-build.sh"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_rpi5.config b/buildroot-external/package/recovery-system/external/configs/recovery_rpi5.config
@@ -1,6 +1,5 @@
 BR2_aarch64=y
 BR2_cortex_a76=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ARM64_PAGE_SIZE_16K=y
 BR2_ROOTFS_LIB_DIR="lib"
 BR2_ROOTFS_LIB32_DIR="lib32"

diff --git a/buildroot-external/package/recovery-system/external/configs/recovery_tinkerboard.config b/buildroot-external/package/recovery-system/external/configs/recovery_tinkerboard.config
@@ -1,6 +1,5 @@
 BR2_arm=y
 BR2_cortex_a17=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_RECOVERY_SYSTEM_PATH)/board/tinkerboard/post-build.sh"
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y