glibc-package.bbclass: merge LOCALE_UTF8_ONLY from poky

diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 1f14bb8..b96aae3 100644 (file)
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -220,10 +220,13 @@ python package_do_split_gconvs () {
        dot_re = re.compile("(.*)\.(.*)")
 
        # Collate the locales by base and encoding
+       utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0)
        encodings = {}
        for l in supported:
                l = l[:-1]
                (locale, charset) = l.split(" ")
+               if utf8_only and charset != 'UTF-8':
+                       continue
                m = dot_re.match(locale)
                if m:
                        locale = m.group(1)