libc-package, default-distrovars: Remove unsupported LOCALE_UTF8_ONLY

ptest subpackages for various recipes added RDEPENDS for
locales that do not exist when LOCALE_UTF8_ONLY is set to 1.

This makes it clear that LOCALE_UTF8_ONLY=1 is untested in Yocto
and became unsupported. Remove this distro variable.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes-recipe/libc-package.bbclass b/meta/classes-recipe/libc-package.bbclass
index c06a2ce90a7e0524fd312560da7222cec2eef2c8..73b7f5a708b0009fc17f67ff1f78ff03f93807d1 100644 (file)
--- a/meta/classes-recipe/libc-package.bbclass
+++ b/meta/classes-recipe/libc-package.bbclass
@@ -321,14 +321,11 @@ python package_do_split_gconvs () {
         bb.note("preparing tree for binary locale generation")
         bb.build.exec_func("do_prep_locale_tree", d)
 
-    utf8_only = int(d.getVar('LOCALE_UTF8_ONLY') or 0)
     utf8_is_default = int(d.getVar('LOCALE_UTF8_IS_DEFAULT') or 0)
 
     encodings = {}
     for locale in to_generate:
         charset = supported[locale]
-        if utf8_only and charset != 'UTF-8':
-            continue
 
         m = dot_re.match(locale)
         if m:

diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index bbd936efa6af237b02638af1f4676e4f0a4b1ae8..7adcdfad4ff40ca0c2a3c447f4201665183d126f 100644 (file)
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -10,7 +10,6 @@ DEFAULT_IMAGE_LINGUAS:libc-glibc = "c en-us en-gb"
 IMAGE_LINGUAS ?= "${DEFAULT_IMAGE_LINGUAS}"
 
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
-LOCALE_UTF8_ONLY ?= "0"
 LOCALE_UTF8_IS_DEFAULT ?= "1"
 LOCALE_UTF8_IS_DEFAULT:class-nativesdk = "0"