[oe-commits] org.oe.dev merge of '1a24470f67b2aef1d747c4c3f8412c0fdb330f5d'

[oe commit]

merge of '1a24470f67b2aef1d747c4c3f8412c0fdb330f5d'
     and '5249a366bb4d53c7531eae39339bc5a264436a79'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 55956ba3628054539f1f1f6c44ab7108d48f8b32
ViewMTN: http://monotone.openembedded.org/revision/info/55956ba3628054539f1f1f6c44ab7108d48f8b32
Files:
1
conf/bitbake.conf
packages/glibc/glibc-package.bbclass
contrib/angstrom/build-feeds.sh
Diffs:

#
# mt diff -r1a24470f67b2aef1d747c4c3f8412c0fdb330f5d -r55956ba3628054539f1f1f6c44ab7108d48f8b32
#
# 
# 
# patch "conf/bitbake.conf"
#  from [ea1e16116ff065e62f58aa7bb32a1757f5aa0695]
#    to [273d61dd50eb590d1fee2b6199f5673202a94747]
# 
# patch "packages/glibc/glibc-package.bbclass"
#  from [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#    to [ad5d2085797fa01b1f94d1ff231db24757badb90]
# 
============================================================
--- conf/bitbake.conf	ea1e16116ff065e62f58aa7bb32a1757f5aa0695
+++ conf/bitbake.conf	273d61dd50eb590d1fee2b6199f5673202a94747
@@ -93,6 +93,11 @@ PACKAGE_ARCHS = "all any noarch ${TARGET
 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.
 ##################################################################
============================================================
--- packages/glibc/glibc-package.bbclass	f4791b3fa7f4d093f75d3e760b405eca7feae357
+++ packages/glibc/glibc-package.bbclass	ad5d2085797fa01b1f94d1ff231db24757badb90
@@ -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)


#
# mt diff -r5249a366bb4d53c7531eae39339bc5a264436a79 -r55956ba3628054539f1f1f6c44ab7108d48f8b32
#
# 
# 
# patch "contrib/angstrom/build-feeds.sh"
#  from [c44336703543187147a43a3d2d4586c2d6329601]
#    to [e433a969a492d5545dd58a76a2342004ccd6e623]
# 
============================================================
--- contrib/angstrom/build-feeds.sh	c44336703543187147a43a3d2d4586c2d6329601
+++ contrib/angstrom/build-feeds.sh	e433a969a492d5545dd58a76a2342004ccd6e623
@@ -47,7 +47,7 @@ do
                        task-proper-tools mc screen findutils \
 	               mono perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
-		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
+		       gpe-mini-browser gpe-mini-browser2 netsurf midori minimo openmoko-browser2 webkit-gtklauncher \
 		       samba meta-nas-server \
 		       apache2 boa cherokee lighttpd thttpd \
 		       gpe-gallery gpe-scap notecase \