diff options
| -rw-r--r-- | meta/classes/libc-package.bbclass | 11 | ||||
| -rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 1 | ||||
| -rw-r--r-- | meta/conf/documentation.conf | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index adb423034d..467d567923 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -332,6 +332,8 @@ python package_do_split_gconvs () { bb.build.exec_func("do_prep_locale_tree", d) utf8_only = int(d.getVar('LOCALE_UTF8_ONLY', True) or 0) + utf8_is_default = int(d.getVar('LOCALE_UTF8_IS_DEFAULT', True) or 0) + encodings = {} for locale in to_generate: charset = supported[locale] @@ -344,10 +346,11 @@ python package_do_split_gconvs () { else: base = locale - # Precompiled locales are kept as is, obeying SUPPORTED, while - # others are adjusted, ensuring that the non-suffixed locales - # are utf-8, while the suffixed are not. - if use_bin == "precompiled": + # Non-precompiled locales may be renamed so that the default + # (non-suffixed) encoding is always UTF-8, i.e., instead of en_US and + # en_US.UTF-8, we have en_US and en_US.ISO-8859-1. This implicitly + # contradicts SUPPORTED. + if use_bin == "precompiled" or not utf8_is_default: output_locale(locale, base, charset) else: if charset == 'UTF-8': diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 0c6d018365..ce42bde4fd 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -7,6 +7,7 @@ KEEPUIMAGE ??= "yes" IMAGE_LINGUAS ?= "en-us en-gb" ENABLE_BINARY_LOCALE_GENERATION ?= "1" LOCALE_UTF8_ONLY ?= "0" +LOCALE_UTF8_IS_DEFAULT ?= "1" DISTRO_FEATURES_DEFAULT ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11" DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index a74da7769a..1e09b6577e 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -266,6 +266,7 @@ LICENSE_PATH[doc] = "Path to additional licenses used during the build." LINUX_KERNEL_TYPE[doc] = "Defines the kernel type to be used in assembling the configuration." LINUX_VERSION[doc] = "The Linux version from kernel.org on which the Linux kernel image being built using the OpenEmbedded build system is based. You define this variable in the kernel recipe." LINUX_VERSION_EXTENSION[doc] = "A string extension compiled into the version string of the Linux kernel built with the OpenEmbedded build system. You define this variable in the kernel recipe." +LOCALE_UTF8_IS_DEFAULT[doc] = "If set, locale names are renamed such that those lacking an explicit encoding (e.g. en_US) will always be UTF-8, and non-UTF-8 encodings are renamed to, e.g., en_US.ISO-8859-1. Otherwise, the encoding is specified by glibc's SUPPORTED file. Not supported for precompiled locales." LOG_DIR[doc] = "Specifies the directory to which the OpenEmbedded build system writes overall log files. The default directory is ${TMPDIR}/log" #M |