Bump buildroot to 2020.11-rc1 (#985)
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UCLIBC_VERSION = 1.0.32
|
||||
UCLIBC_VERSION = 1.0.36
|
||||
UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
|
||||
UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
|
||||
UCLIBC_LICENSE = LGPL-2.1+
|
||||
@@ -59,18 +59,18 @@ endif
|
||||
# noMMU binary formats
|
||||
ifeq ($(BR2_BINFMT_FLAT_ONE),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF)
|
||||
endef
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
|
||||
define UCLIBC_BINFMT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -82,12 +82,12 @@ ifeq ($(UCLIBC_TARGET_ARCH),arc)
|
||||
UCLIBC_ARC_PAGE_SIZE = CONFIG_ARC_PAGE_SIZE_$(call qstrip,$(BR2_ARC_PAGE_SIZE))
|
||||
define UCLIBC_ARC_PAGE_SIZE_CONFIG
|
||||
$(SED) '/CONFIG_ARC_PAGE_SIZE_*/d' $(@D)/.config
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE))
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_ARC_ATOMIC_EXT),)
|
||||
define UCLIBC_ARC_ATOMICS_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -100,12 +100,12 @@ endif # arc
|
||||
ifeq ($(UCLIBC_TARGET_ARCH),arm)
|
||||
define UCLIBC_ARM_ABI_CONFIG
|
||||
$(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI)
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_BINFMT_FLAT),y)
|
||||
define UCLIBC_ARM_BINFMT_FLAT
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -115,7 +115,7 @@ endif
|
||||
# support the ARM instructions.
|
||||
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB2):$(BR2_ARM_CPU_HAS_ARM),y:)
|
||||
define UCLIBC_ARM_NO_CONTEXT_FUNCS
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -130,7 +130,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),m68k)
|
||||
# disable DOPIC for flat without separate data
|
||||
ifeq ($(BR2_BINFMT_FLAT_ONE),y)
|
||||
define UCLIBC_M68K_BINFMT_FLAT
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,DOPIC)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -144,13 +144,13 @@ ifeq ($(UCLIBC_TARGET_ARCH),mips)
|
||||
UCLIBC_MIPS_ABI = CONFIG_MIPS_$(call qstrip,$(BR2_UCLIBC_MIPS_ABI))_ABI
|
||||
define UCLIBC_MIPS_ABI_CONFIG
|
||||
$(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI),$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI))
|
||||
endef
|
||||
|
||||
UCLIBC_MIPS_NAN = CONFIG_MIPS_NAN_$(call qstrip,$(BR2_UCLIBC_MIPS_NAN))
|
||||
define UCLIBC_MIPS_NAN_CONFIG
|
||||
$(SED) '/CONFIG_MIPS_NAN_.*/d' $(@D)/.config
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN),$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN))
|
||||
endef
|
||||
endif # mips
|
||||
|
||||
@@ -162,7 +162,7 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh)
|
||||
UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE))
|
||||
define UCLIBC_SH_TYPE_CONFIG
|
||||
$(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE),$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE))
|
||||
endef
|
||||
endif # sh
|
||||
|
||||
@@ -175,7 +175,7 @@ UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE))
|
||||
define UCLIBC_SPARC_TYPE_CONFIG
|
||||
$(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \
|
||||
$(@D)/.config
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE),$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE))
|
||||
endef
|
||||
endif # sparc
|
||||
|
||||
@@ -186,9 +186,9 @@ endif # sparc
|
||||
ifeq ($(UCLIBC_TARGET_ARCH),powerpc)
|
||||
UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE))
|
||||
define UCLIBC_POWERPC_TYPE_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_E500,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE),$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC)
|
||||
$(call KCONFIG_DISABLE_OPT,CONFIG_E500)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE))
|
||||
endef
|
||||
endif # powerpc
|
||||
|
||||
@@ -198,7 +198,7 @@ endif # powerpc
|
||||
ifeq ($(UCLIBC_TARGET_ARCH),i386)
|
||||
UCLIBC_X86_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_X86_TYPE))
|
||||
define UCLIBC_X86_TYPE_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE),$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE))
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -207,7 +207,7 @@ endif
|
||||
#
|
||||
ifeq ($(BR2_ENABLE_DEBUG),y)
|
||||
define UCLIBC_DEBUG_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,DODEBUG,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,DODEBUG)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -217,17 +217,17 @@ endif
|
||||
|
||||
ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG)
|
||||
define UCLIBC_ENDIAN_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_ENDIAN_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -237,13 +237,13 @@ endif
|
||||
|
||||
ifeq ($(BR2_USE_MMU),y)
|
||||
define UCLIBC_MMU_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU)
|
||||
$(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_MMU_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU)
|
||||
$(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -251,7 +251,7 @@ endif
|
||||
# IPv6
|
||||
#
|
||||
|
||||
UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
|
||||
UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6)
|
||||
|
||||
#
|
||||
# soft-float
|
||||
@@ -259,14 +259,14 @@ UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
|
||||
|
||||
ifeq ($(BR2_SOFT_FLOAT),y)
|
||||
define UCLIBC_FLOAT_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,DO_C99_MATH,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS)
|
||||
$(call KCONFIG_ENABLE_OPT,DO_C99_MATH)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_FLOAT_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -275,13 +275,13 @@ endif
|
||||
#
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y)
|
||||
define UCLIBC_SSP_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_SSP_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -290,21 +290,21 @@ endif
|
||||
#
|
||||
ifeq ($(BR2_PTHREADS_NONE),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE)
|
||||
endef
|
||||
else ifeq ($(BR2_PTHREADS),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE)
|
||||
endef
|
||||
else ifeq ($(BR2_PTHREADS_NATIVE),y)
|
||||
define UCLIBC_THREAD_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -313,9 +313,9 @@ endif
|
||||
#
|
||||
|
||||
ifeq ($(BR2_PTHREAD_DEBUG),y)
|
||||
UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config)
|
||||
UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT)
|
||||
else
|
||||
UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config)
|
||||
UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT)
|
||||
endif
|
||||
|
||||
#
|
||||
@@ -324,18 +324,18 @@ endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y)
|
||||
define UCLIBC_LOCALE_CONFIG
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE,$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE)
|
||||
$(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)")
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA)
|
||||
$(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA)
|
||||
$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING)
|
||||
endef
|
||||
else
|
||||
define UCLIBC_LOCALE_CONFIG
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config)
|
||||
$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE)
|
||||
endef
|
||||
endif
|
||||
|
||||
@@ -344,9 +344,9 @@ endif
|
||||
#
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
|
||||
UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config)
|
||||
UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR)
|
||||
else
|
||||
UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config)
|
||||
UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR)
|
||||
endif
|
||||
|
||||
#
|
||||
@@ -354,9 +354,9 @@ endif
|
||||
#
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED,$(@D)/.config)
|
||||
UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED)
|
||||
else
|
||||
UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED,$(@D)/.config)
|
||||
UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED)
|
||||
endif
|
||||
|
||||
#
|
||||
@@ -370,13 +370,13 @@ UCLIBC_MAKE_FLAGS = \
|
||||
HOSTCC="$(HOSTCC)"
|
||||
|
||||
define UCLIBC_KCONFIG_FIXUP_CMDS
|
||||
$(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config)
|
||||
$(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/",$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config)
|
||||
$(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)")
|
||||
$(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH))
|
||||
$(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)")
|
||||
$(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include")
|
||||
$(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/")
|
||||
$(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr")
|
||||
$(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib")
|
||||
$(UCLIBC_MMU_CONFIG)
|
||||
$(UCLIBC_BINFMT_CONFIG)
|
||||
$(UCLIBC_ARC_PAGE_SIZE_CONFIG)
|
||||
|
||||
Reference in New Issue
Block a user