From 9f60a6fbfb93f17a9146f93380f9a3775fe48f4d Mon Sep 17 00:00:00 2001 From: Kevin Tian Date: Fri, 3 Sep 2010 14:29:17 +0800 Subject: 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 --- meta/recipes-core/glibc/glibc-package.inc | 1 + meta/recipes-core/glibc/glibc_2.10.1.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/glibc') 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}" -- cgit v1.2.3