[oe-commits] org.oe.dev merge of '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'

[koen commit]

merge of '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'
     and '7e45814ce1cb1ed4bb79fe646a4a5546cfa6a5e2'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1c882a47f7d8c75d963d518a8dadf22f8e73a820
ViewMTN: http://monotone.openembedded.org/revision/info/1c882a47f7d8c75d963d518a8dadf22f8e73a820
Files:
1
conf/distro/include/angstrom.inc
packages/glibc/glibc-package.bbclass
Diffs:

#
# mt diff -r4debfc11cf9e85b98e7395e221cb5044cf8fe49d -r1c882a47f7d8c75d963d518a8dadf22f8e73a820
#
# 
# 
# patch "conf/distro/include/angstrom.inc"
#  from [fbec2661b476213454b69adc6d89a7b5be329d4d]
#    to [52dbd93aadf5979fc5b657ed07068f613d323a74]
# 
============================================================
--- conf/distro/include/angstrom.inc	fbec2661b476213454b69adc6d89a7b5be329d4d
+++ conf/distro/include/angstrom.inc	52dbd93aadf5979fc5b657ed07068f613d323a74
@@ -35,6 +35,9 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
 ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 
+# We only want to build UTF8 locales
+LOCALE_UTF8_ONLY = "1"
+
 #qemu doesn't like armv6/eabi/vfp
 ENABLE_BINARY_LOCALE_GENERATION_mx31ads = "0"
 ENABLE_BINARY_LOCALE_GENERATION_nokia800 = "0"


#
# mt diff -r7e45814ce1cb1ed4bb79fe646a4a5546cfa6a5e2 -r1c882a47f7d8c75d963d518a8dadf22f8e73a820
#
# 
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [7424898eefe4cc4de00b0f2afd7c044a6c8fb18d]
#    to [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
# 
============================================================
--- packages/glibc/glibc-package.bbclass	7424898eefe4cc4de00b0f2afd7c044a6c8fb18d
+++ packages/glibc/glibc-package.bbclass	87de7a00ded18ae91f844d05b3fb78dd64e0fd7b
@@ -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)