system: move locale purging options to the "System configuration" menu

The options to purge locales and to generate locale data are currently
located in the toolchain menu. However, these options are not really
related to the toolchain per-se, they are more system-level
configuration options, much like the timezone selection option we
already have in the "System configuration" menu.

Therefore, it makes more sense to have the locale-related options in
the "System configuration" menu as well.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2016-08-03 00:19:40 +02:00 committed by Peter Korsgaard
parent 6e757a6c5c
commit a77e8d275f
2 changed files with 34 additions and 34 deletions

View File

@ -382,6 +382,40 @@ comment "automatic network configuration via DHCP needs ifupdown or busybox"
endif # BR2_ROOTFS_SKELETON_DEFAULT
config BR2_ENABLE_LOCALE_PURGE
bool "Purge unwanted locales"
default y
help
Explicitly specify what locales to install on target. If N
then all locales supported by packages are installed.
config BR2_ENABLE_LOCALE_WHITELIST
string "Locales to keep"
default "C en_US"
depends on BR2_ENABLE_LOCALE_PURGE
help
Whitespace seperated list of locales to allow on target.
Locales not listed here will be removed from the target.
See 'locale -a' on your host for a list of locales available
on your build host, or have a look in /usr/share/locale in
the target file system for available locales.
Notice that listing a locale here doesn't guarantee that it
will be available on the target - That purely depends on the
support for that locale in the selected packages.
config BR2_GENERATE_LOCALE
string "Generate locale data"
default ""
depends on \
(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && BR2_ENABLE_LOCALE) || \
BR2_TOOLCHAIN_USES_GLIBC
help
Generate support for a list of locales. Locales can be
specified with or without encoding, when no encoding is
specified, UTF-8 is assumed. Examples of locales: en_US,
fr_FR.UTF-8.
config BR2_TARGET_TZ_INFO
bool "Install timezone info"
# No timezone for musl; only for uClibc or glibc.

View File

@ -42,40 +42,6 @@ config BR2_TOOLCHAIN_HAS_SSP
config BR2_TOOLCHAIN_SUPPORTS_PIE
bool
config BR2_ENABLE_LOCALE_PURGE
bool "Purge unwanted locales"
default y
help
Explicitly specify what locales to install on target. If N
then all locales supported by packages are installed.
config BR2_ENABLE_LOCALE_WHITELIST
string "Locales to keep"
default "C en_US"
depends on BR2_ENABLE_LOCALE_PURGE
help
Whitespace seperated list of locales to allow on target.
Locales not listed here will be removed from the target.
See 'locale -a' on your host for a list of locales available
on your build host, or have a look in /usr/share/locale in
the target file system for available locales.
Notice that listing a locale here doesn't guarantee that it
will be available on the target - That purely depends on the
support for that locale in the selected packages.
config BR2_GENERATE_LOCALE
string "Generate locale data"
default ""
depends on \
(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && BR2_ENABLE_LOCALE) || \
BR2_TOOLCHAIN_USES_GLIBC
help
Generate support for a list of locales. Locales can be
specified with or without encoding, when no encoding is
specified, UTF-8 is assumed. Examples of locales: en_US,
fr_FR.UTF-8.
config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY
bool "Copy gconv libraries"
depends on BR2_TOOLCHAIN_USES_GLIBC