aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2009-05-16 21:52:03 +0400
committerRoman I Khimov <khimov@altell.ru>2009-05-17 09:23:59 +0400
commit2b198cea9ddc51911823f5af12632c138766d024 (patch)
treec8b2319742f28d145664da9b7167babb68b3fc2b
parent6065fa491c009118ae282ae933215649cccfcd24 (diff)
downloadopenembedded-2b198cea9ddc51911823f5af12632c138766d024.tar.gz
(e)glibc-package: enable binary locale generation on x86 and x86_64
Works well for this targets, so we can add that to BINARY_LOCALE_ARCHES whitelist. Acked-by: Tom Rini <trini@embeddedalley.com>
-rw-r--r--recipes/eglibc/eglibc-package.bbclass4
-rw-r--r--recipes/glibc/glibc-package.bbclass2
2 files changed, 4 insertions, 2 deletions
diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index 241499f4a8..22ff52b3ff 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -24,7 +24,7 @@ python __anonymous () {
ENABLE_BINARY_LOCALE_GENERATION ?= "0"
# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
-BINARY_LOCALE_ARCHES ?= "arm.*"
+BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64"
PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile"
PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*"
@@ -287,6 +287,8 @@ python package_do_split_gconvs () {
def output_locale_binary(name, locale, encoding):
target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
+ if target_arch in ("i486", "i586", "i686"):
+ target_arch = "i386"
kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1)
if kernel_ver is None:
qemu = "qemu-%s -s 1048576" % target_arch
diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass
index 46f809e22b..ac7e0f3670 100644
--- a/recipes/glibc/glibc-package.bbclass
+++ b/recipes/glibc/glibc-package.bbclass
@@ -24,7 +24,7 @@ python __anonymous () {
ENABLE_BINARY_LOCALE_GENERATION ?= "0"
# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
-BINARY_LOCALE_ARCHES ?= "arm.*"
+BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64"
# Set this to zero if you don't want ldconfig in the output package
USE_LDCONFIG ?= "1"