summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-09-03 14:29:17 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-03 09:30:26 +0100
commit9f60a6fbfb93f17a9146f93380f9a3775fe48f4d (patch)
tree80da77425b67abffe2d6a8771e373dffc0592726 /meta
parent3d7431b71b3308c917ba886d213277874c2610b0 (diff)
downloadopenembedded-core-9f60a6fbfb93f17a9146f93380f9a3775fe48f4d.tar.gz
openembedded-core-9f60a6fbfb93f17a9146f93380f9a3775fe48f4d.tar.bz2
openembedded-core-9f60a6fbfb93f17a9146f93380f9a3775fe48f4d.tar.xz
openembedded-core-9f60a6fbfb93f17a9146f93380f9a3775fe48f4d.zip
glibc-package.inc: disable build-time locale generation for nativesdk
The idea of build-time locale generation is documented in glibc-package.inc: Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION is set. The idea is to avoid running localedef on the target (at first boot) to decrease initial boot time and avoid localedef being killed by the OOM killer which used to effectively break i18n on machines with < 128MB RAM. However it doesn't make sense to do same thing for glibc-nativesdk, as the build system is powerful. More importantly is that ideally host_arch running sdk may even be out of the support list of target_arch by qemu-native. Regarding to above rationale, this commit disables build time locale generation to avoid following error when asking qemu to run localdef: NOTE: /opt/poky/sysroots/i586-pokysdk-linux/lib/ld-linux.so.2: No such file or directory nativesdk binaris have opt path hardcoded to avoid mess with host bits, which is another reason that build time locale generation is not feasible here. This fixes [BUGID #264] also add 'nativesdk' to eglibc per RP's suggestion Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc1
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
-rw-r--r--meta/recipes-core/glibc/glibc-package.inc1
-rw-r--r--meta/recipes-core/glibc/glibc_2.10.1.bb2
4 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 01bda10dc..a315e05d6 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -21,6 +21,7 @@ python __anonymous () {
# default to disabled until qemu works for everyone
ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+ENABLE_BINARY_LOCALE_GENERATION_pn-eglibc-nativesdk = "0"
# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index 45e152079..79ec6a399 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -2,7 +2,7 @@ require eglibc.inc
DEPENDS += "gperf-native"
FILESPATHPKG =. "eglibc-svn:"
-PR = "r2"
+PR = "r3"
SRCREV="10809"
EGLIBC_BRANCH="eglibc-2_12"
SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 5c683bbe7..9aaa4f387 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -22,6 +22,7 @@ python __anonymous () {
# default to disabled until qemu works for everyone
ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+ENABLE_BINARY_LOCALE_GENERATION_pn-glibc-nativesdk = "0"
# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips"
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index a82a87025..2b8718622 100644
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-PR = "r2"
+PR = "r3"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"