Explorar el Código

configs: remove uClibc config options

Following the switch to Glibc as the default libc in Buildroot [1],
all defconfigs expecting uClibc with wchar (or any other uClibc
specific option) should now select BR2_TOOLCHAIN_BUILDROOT_UCLIBC too.

Even if all defconfigs has been tested with uClibc, maintainers
prefer to not enforce a C library and use the default of Buildroot,
which is now glibc.

This commit remove uClibc specific options BR2_TOOLCHAIN_BUILDROOT_WCHAR,
BR2_PTHREAD_DEBUG (required by gdb) and BR2_TOOLCHAIN_BUILDROOT_USE_SSP.

Since glibc always has argp built-in, also remove the standalone one
from affected toolchains...

Fixes:
https://gitlab.com/kubu93/buildroot/-/jobs/2911738579

[1] 4057e36ca9665edd5248512e4edba2c243b8f4be
[2] http://lists.busybox.net/pipermail/buildroot/2022-August/649998.html

Signed-off-by: Romain Naour <romain.naour@gmail.com>
[yann.morin.1998@free.fr: also drop argp-standalone]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Romain Naour hace 2 años
padre
commit
4ebc9d0b85

+ 0 - 3
configs/aarch64_efi_defconfig

@@ -1,9 +1,6 @@
 # Architecture
 BR2_aarch64=y
 
-# Toolchain, required for eudev and grub
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
 # System
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 

+ 0 - 4
configs/at91sam9x5ek_dev_defconfig

@@ -5,10 +5,6 @@ BR2_arm926t=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 4
configs/at91sam9x5ek_mmc_dev_defconfig

@@ -5,10 +5,6 @@ BR2_arm926t=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 2
configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig

@@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"

+ 0 - 4
configs/atmel_sama5d2_xplained_mmc_dev_defconfig

@@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 4
configs/atmel_sama5d3_xplained_dev_defconfig

@@ -7,10 +7,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 4
configs/atmel_sama5d3_xplained_mmc_dev_defconfig

@@ -7,10 +7,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 4
configs/atmel_sama5d4_xplained_dev_defconfig

@@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 4
configs/atmel_sama5d4_xplained_mmc_dev_defconfig

@@ -8,10 +8,6 @@ BR2_ARM_INSTRUCTIONS_THUMB2=y
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
 # Needed for some packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Needed for gdb
-BR2_PTHREAD_DEBUG=y
-# Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System Configuration

+ 0 - 3
configs/bananapro_defconfig

@@ -8,9 +8,6 @@ BR2_ARM_FPU_NEON_VFPV4=y
 # Linux headers same as kernel, a 5.4 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 
-# Toolchain
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="bananapro"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pro!"

+ 0 - 1
configs/engicam_imx6qdl_icore_qt5_defconfig

@@ -47,7 +47,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg"
 BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay"
 
 # qt5 dependencies
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # qt5

+ 0 - 2
configs/galileo_defconfig

@@ -1,7 +1,5 @@
 BR2_x86_x1000=y
 BR2_GLOBAL_PATCH_DIR="board/intel/galileo/patches"
-# Needed for TARGET_GRUB2
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Linux headers same as kernel, a 3.14 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y

+ 0 - 1
configs/imx6-sabresd_qt5_defconfig

@@ -8,7 +8,6 @@ BR2_ARM_FPU_VFPV3=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 
 # Additional features needed for packages
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 # System

+ 0 - 1
configs/kontron_smarc_sal28_defconfig

@@ -1,7 +1,6 @@
 BR2_aarch64=y
 BR2_cortex_a72=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_OVERLAY="board/kontron/smarc-sal28/rootfs_overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/kontron/smarc-sal28/post-build.sh"

+ 0 - 3
configs/lego_ev3_defconfig

@@ -2,9 +2,6 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Toolchain
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
 # system
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"

+ 0 - 4
configs/mender_x86_64_efi_defconfig

@@ -3,10 +3,6 @@ BR2_x86_64=y
 
 # Toolchain
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_17=y
-# Required for eudev (to autoload drivers)
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-# Required for sysvinit
-BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"

+ 0 - 3
configs/microchip_sam9x60ek_mmc_dev_defconfig

@@ -1,7 +1,5 @@
 BR2_arm=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TARGET_GENERIC_HOSTNAME="sam9x60ek"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -47,7 +45,6 @@ BR2_PACKAGE_LIBDRM=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_ARGP_STANDALONE=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y

+ 0 - 3
configs/microchip_sama5d27_wlsom1_ek_mmc_dev_defconfig

@@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
@@ -50,7 +48,6 @@ BR2_PACKAGE_LIBDRM=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_ARGP_STANDALONE=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y

+ 0 - 3
configs/microchip_sama5d2_icp_mmc_dev_defconfig

@@ -4,8 +4,6 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
@@ -42,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_ARGP_STANDALONE=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y

+ 0 - 3
configs/microchip_sama7g5ek_mmc_dev_defconfig

@@ -2,8 +2,6 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-BR2_PTHREAD_DEBUG=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
@@ -42,7 +40,6 @@ BR2_PACKAGE_LIBDRM=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_DTC=y
 BR2_PACKAGE_DTC_PROGRAMS=y
-BR2_PACKAGE_ARGP_STANDALONE=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y

+ 0 - 2
configs/minnowboard_max_defconfig

@@ -10,8 +10,6 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg"
 
 # Linux headers same as kernel, a 5.10 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
-# Needed for grub2
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y

+ 0 - 3
configs/pc_x86_64_bios_defconfig

@@ -1,9 +1,6 @@
 # Architecture
 BR2_x86_64=y
 
-# Toolchain, required for eudev (to autoload drivers)
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y

+ 0 - 3
configs/pc_x86_64_efi_defconfig

@@ -1,9 +1,6 @@
 # Architecture
 BR2_x86_64=y
 
-# Toolchain, required for eudev (to autoload drivers)
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y

+ 0 - 3
configs/qemu_aarch64_sbsa_defconfig

@@ -2,9 +2,6 @@
 BR2_aarch64=y
 BR2_cortex_a57=y
 
-# Toolchain
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
-
 # System
 BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"