From bf03b2865e2ba81363ea1eaad7b08e5bac5926e2 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 1 Mar 2008 21:03:24 +0000 Subject: bitbake.conf: added QEMU_OPTIONS variable used for generating glibc binary locales for armv6 cpu (from Poky) --- conf/bitbake.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 858e411d8c..de526f0e56 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -93,6 +93,11 @@ PACKAGE_ARCH = "${HOST_ARCH}" MACHINE_ARCH = "${@[bb.data.getVar('HOST_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))]}" PACKAGE_ARCHS = "all any noarch ${TARGET_ARCH} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" +# select proper CPU to get binary locales generated +QEMU_OPTIONS = "" +QEMU_OPTIONS_iwmmxt = "-cpu pxa270-c5" +QEMU_OPTIONS_armv6 = "-cpu arm1136" + ################################################################## # Date/time variables. ################################################################## -- cgit v1.2.3 From b690ceb60f016853f3705c0d7c854723253806e7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sat, 1 Mar 2008 21:05:00 +0000 Subject: glibc: use QEMU_OPTIONS to generate binary locales for armv6 machines (from Poky) --- packages/glibc/glibc-package.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 50fae44bf3..bd1cb4f4e4 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -271,7 +271,12 @@ python package_do_split_gconvs () { i18npath = base_path_join(treedir, datadir, "i18n") localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + + qemu_options = bb.data.getVar("QEMU_OPTIONS_%s" % bb.data.getVar('PACKAGE_ARCH', d, 1), d, 1) + if not qemu_options: + qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) + + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) -- cgit v1.2.3