Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

76 files changed, 39141 insertions, 167 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cb16f0c73e..9b15080612 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -161,11 +161,11 @@ Recipes:    gnumeric, gobby, obby, imposter, inkscape
 Recipes:    *moko*, telepathy, tilibs, xchat, xournal.
 
 Person:     Kristoffer Ericson
-Mail:       Kristoffer_e1@hotmail.com
-Website:    www.jlime.com
-Machines:   spitz, jornada 680, jornada 720
-Distros:    JLime, Openzaurus
-Interests:  wifi, kernels, emulation, qemu, git
+Mail:       Kristoffer.ericson@gmail.com
+Website:    http://www.jlime.com
+Machines:   jornada 680, jornada 720, NEC Mobilepro 900/c, Ben Nanonote
+Distros:    JLime
+Interests:  Kernels, emulation, superh/arm/mips 
 Recipes:    linux-jlime*, scummvm, blackbox
 
 Person:     Leon Woestenberg
diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass
index 29660867b0..413ed14931 100644
--- a/classes/glibc-package.bbclass
+++ b/classes/glibc-package.bbclass
@@ -16,20 +16,32 @@ INSANE_SKIP_glibc-dbg = True
 
 libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc*.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
 
-FILES_glibc = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
+# The problem is that if PN = "glibc", FILES_${PN} will overwrite FILES_glibc
+# Solution: Make them both the same thing, then it doesn't matter
+
+glibcfiles = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}"
+glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
+                  ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
+                  ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
+glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
+                ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${libdir}/*nonshared.a \
+                ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
+
+FILES_glibc = "${glibcfiles}"
+FILES_${PN} = "${glibcfiles}"
 FILES_ldd = "${bindir}/ldd"
 FILES_libsegfault = "${base_libdir}/libSegFault*"
 FILES_libcidn = "${base_libdir}/libcidn*.so"
 FILES_libmemusage = "${base_libdir}/libmemusage.so"
 FILES_glibc-extra-nss = "${base_libdir}/libnss*"
 FILES_sln = "${base_sbindir}/sln"
-FILES_glibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/*nonshared.a"
+FILES_glibc-dev = "${glibcdevfiles}"
+FILES_${PN}-dev = "${glibcdevfiles}"
+FILES_glibc-dbg = "${glibcdbgfiles}"
+FILES_${PN}-dbg = "${glibcdbgfiles}"
 FILES_nscd = "${sbindir}/nscd* ${sysconfdir}/nscd* ${sysconfdir}/init.d/nscd*"
 FILES_glibc-utils = "${bindir}/* ${sbindir}/*"
 FILES_glibc-gconv = "${libdir}/gconv/*"
-FILES_glibc-dbg = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \
-                  ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \
-                  ${libdir}/gconv/.debug ${libexecdir}/*/.debug"
 FILES_catchsegv = "${bindir}/catchsegv"
 RDEPENDS_catchsegv = "libsegfault"
 FILES_glibc-pcprofile = "${base_libdir}/libpcprofile.so"
@@ -148,17 +160,29 @@ python package_do_split_gconvs () {
 	do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='')
 	bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d)
 
-	supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
-	if not supported or supported == "all":
-	    f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
-	    supported = f.readlines()
-	    f.close()
-	else:
-	    supported = supported.split()
-	    supported = map(lambda s:s.replace(".", " ") + "\n", supported)
+	use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
 
 	dot_re = re.compile("(.*)\.(.*)")
 
+	if use_bin != "precompiled":
+		supported = bb.data.getVar('GLIBC_GENERATE_LOCALES', d, 1)
+		if not supported or supported == "all":
+		    f = open(base_path_join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r")
+		    supported = f.readlines()
+		    f.close()
+		else:
+		    supported = supported.split()
+		    supported = map(lambda s:s.replace(".", " ") + "\n", supported)
+	else:
+		supported = []
+		full_bin_path = bb.data.getVar('PKGD', d, True) + binary_locales_dir
+		for dir in os.listdir(full_bin_path):
+			dbase = dir.split(".")
+			d2 = "  "
+			if len(dbase) > 1:
+				d2 = "." + dbase[1].upper() + "  "
+			supported.append(dbase[0] + d2)
+
 	# Collate the locales by base and encoding
 	utf8_only = int(bb.data.getVar('LOCALE_UTF8_ONLY', d, 1) or 0)
 	encodings = {}
@@ -174,21 +198,20 @@ python package_do_split_gconvs () {
 			encodings[locale] = []
 		encodings[locale].append(charset)
 
-	def output_locale_source(name, locale, encoding):
-		pkgname = 'locale-base-' + legitimize_package_name(name)
-
+	def output_locale_source(name, pkgname, locale, encoding):
 		bb.data.setVar('RDEPENDS_%s' % pkgname, 'localedef glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d)
-		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
-		m = re.match("(.*)_(.*)", name)
-		if m:
-			rprovides += ' virtual-locale-%s' % m.group(1)
-		bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
-		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
-		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
 		bb.data.setVar('pkg_postinst_%s' % pkgname, bb.data.getVar('locale_base_postinst', d, 1) % (locale, encoding, locale), d)
 		bb.data.setVar('pkg_postrm_%s' % pkgname, bb.data.getVar('locale_base_postrm', d, 1) % (locale, encoding, locale), d)
 
-	def output_locale_binary(name, locale, encoding):
+	def output_locale_binary_rdepends(name, pkgname, locale, encoding):
+		m = re.match("(.*)\.(.*)", name)
+		if m:
+			glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
+		else:
+			glibc_name = name
+		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
+
+	def output_locale_binary(name, pkgname, locale, encoding):
 		target_arch = bb.data.getVar("TARGET_ARCH", d, 1)
 		if target_arch in ("i486", "i586", "i686"):
 			target_arch = "i386"
@@ -208,19 +231,6 @@ python package_do_split_gconvs () {
 		else:
 			qemu = "qemu-%s  -s 1048576 -r %s" % (target_arch, kernel_ver)
 		pkgname = 'locale-base-' + legitimize_package_name(name)
-		m = re.match("(.*)\.(.*)", name)
-		if m:
-			glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-",""))
-		else:
-			glibc_name = name
-		bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d)
-		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
-		m = re.match("(.*)_(.*)", name)
-		if m:
-			rprovides += ' virtual-locale-%s' % m.group(1)
-		bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
-		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
-		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
 
 		treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree")
 		ldlibdir = "%s/lib" % treedir
@@ -239,13 +249,22 @@ python package_do_split_gconvs () {
 			raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd)
 
 	def output_locale(name, locale, encoding):
-		use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
+		pkgname = 'locale-base-' + legitimize_package_name(name)
+		bb.data.setVar('ALLOW_EMPTY_%s' % pkgname, '1', d)
+		bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d)
+		rprovides = 'virtual-locale-%s' % legitimize_package_name(name)
+		m = re.match("(.*)_(.*)", name)
+		if m:
+			rprovides += ' virtual-locale-%s' % m.group(1)
+		bb.data.setVar('RPROVIDES_%s' % pkgname, rprovides, d)
 		if use_bin == "compile":
-			output_locale_binary(name, locale, encoding)
+			output_locale_binary_rdepends(name, pkgname, locale, encoding)
+			output_locale_binary(name, pkgname, locale, encoding)
+		elif use_bin == "precompiled":
+			output_locale_binary_rdepends(name, pkgname, locale, encoding)
 		else:
-			output_locale_source(name, locale, encoding)
+			output_locale_source(name, pkgname, locale, encoding)
 
-	use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
 	if use_bin == "compile":
 		bb.note("preparing tree for binary locale generation")
 		bb.build.exec_func("do_prep_locale_tree", d)
@@ -266,15 +285,16 @@ python package_do_split_gconvs () {
 			for e in encodings[l]:
 				output_locale('%s.%s' % (l, e), l, e)
 
-	if non_utf8 != []:
+	if non_utf8 != [] and use_bin != "precompiled":
 		bb.note("the following locales are supported only in legacy encodings:")
 		bb.note("  " + " ".join(non_utf8))
 
-	use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1)
 	if use_bin == "compile":
 		bb.note("collecting binary locales from locale tree")
 		bb.build.exec_func("do_collect_bins_from_locale_tree", d)
 		do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True)
+	elif use_bin == "precompiled":
+		do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True)
 	else:
 		bb.note("generation of binary locales disabled. this may break i18n!")
 
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 246ecd4ecc..bb81f33b29 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -427,8 +427,8 @@ python populate_packages () {
 			dpath = os.path.dirname(fpath)
 			bb.mkdirhier(dpath)
 			ret = bb.copyfile(file, fpath)
-			if ret is False or ret == 0:
-				raise bb.build.FuncFailed("File population failed")
+			if ret is False:
+				raise bb.build.FuncFailed("File population failed when copying %s to %s" % (file, fpath))
 			if pkg == main_pkg and main_is_empty:
 				main_is_empty = 0
 		del localdata
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index b4ee62c2a3..1420089692 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -21,6 +21,10 @@ EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIB
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN} += " ${palmtopdir} "
+FILES_${PN}-dev += " ${palmtopdir}/plugins/*/lib*.so \
+                     ${palmtopdir}/plugins/*/*.la \
+                     ${palmtopdir}/plugins/*/*.a \
+                     ${palmtopdir}/plugins/*/*.o "
 FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
                      ${palmtopdir}/bin/.debug \
                      ${palmtopdir}/plugins/*/.debug "
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass
index 6c86d44a21..a45c1e679b 100644
--- a/classes/tinderclient.bbclass
+++ b/classes/tinderclient.bbclass
@@ -80,7 +80,6 @@ def tinder_format_http_post(d,status,log):
         "TARGETOS"     : data.getVar('TARGET_OS', d, True) or "Unknown",
         "MACHINE"      : data.getVar('MACHINE', d, True) or "Unknown",
         "DISTRO"       : data.getVar('DISTRO', d, True) or "Unknown",
-        "zecke-rocks"  : "sure",
     }
 
     # optionally add the status
diff --git a/conf/checksums.ini b/conf/checksums.ini
index b2bc05b06f..784a092264 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -298,10 +298,6 @@ sha256=c54e779a720841126e23d692de85243e23b0d94fb7792a958b96b5bd097a8b85
 md5=ce018f681b469a1d72ffc32650304b98
 sha256=830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e
 
-[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz]
-md5=c63bad58524501e367af9842f510b458
-sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4
-
 [http://media.djangoproject.com/releases/1.0.2/Django-1.0.2-final.tar.gz]
 md5=89353e3749668778f1370d2e444f3adc
 sha256=50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
@@ -5406,6 +5402,10 @@ sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
 md5=066bd39d80f286ae5ce69a2adbbd01e4
 sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
 
+[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz]
+md5=c63bad58524501e367af9842f510b458
+sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4
+
 [http://distcc.samba.org/ftp/distcc/distcc-2.11.tar.bz2]
 md5=f3458779c13255d88ee89ea7ccddda29
 sha256=00ca6747501d1b6034398ba5482dcb1e7cf3aff8739fbff0c72e58602d68774c
@@ -11426,6 +11426,10 @@ sha256=e2f63d2d445ffeb072638eab885b1a629e372d1db711c8afb26a62bc56096289
 md5=9e23d3dbea0e89bab8a9acc6880150de
 sha256=69a2f9491480ff756d1cc4c8ea2bdc13d40ea8ddc8f93f26957bade8219a1d86
 
+[http://ftp.gnu.org/pub/gnu/guile/guile-1.8.7.tar.gz]
+md5=991b5b3efcbbc3f7507d05bc42f80a5e
+sha256=bfee6339d91955a637e7f541d96f5b1d53271b42bb4a37b8867d186a6c66f0b3
+
 [http://gupnp.org/sources/gupnp/gupnp-0.12.2.tar.gz]
 md5=5350f5f28fb3742779702a496ab75d72
 sha256=9e4edb3ca6d11e397d9f98537fa8954851dc044d13ecafd4f4547117cefbdd28
@@ -26070,13 +26074,17 @@ sha256=7b08bb8a98ad8a06e2cafda05ab21f2a69b2d64252dfc9435c93094d979e7c5a
 md5=75c74b9c8df7c83c8e3c3068fff08a82
 sha256=5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7
 
+[ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz]
+md5=e401e284512be17f5cf63ee52e4f3284
+sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
+
 [ftp://elsie.nci.nih.gov/pub/tzdata2009r.tar.gz]
 md5=c38d977a3f9f4d4646cab902554c519e
 sha256=684d23e3ebe825c9db90732534446f4e33f5ad4455980b15fd9eb2e4ba5a6731
 
-[ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz]
-md5=e401e284512be17f5cf63ee52e4f3284
-sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
+[ftp://elsie.nci.nih.gov/pub/tzdata2009s.tar.gz]
+md5=3cd8038d7bbfb3a4ac544aceef724853
+sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz]
 md5=8b766bb807c1f7c0c02ff798ea5db80e
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 78eaec4f73..8e960d0d66 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -3,12 +3,12 @@
 # FSO Projects -- Cornucopia
 FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "a8abe5bbe86c5625ab4c649eae899b9a8aac4b2d"
+SRCREV_pn-fsodeviced ?= "f7ef257660227403dc352423066deeeabaf1fa73"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsousaged ?= "11dbb63abb48094fab63c64de189fe99189b9f73"
+SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
 SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14"
 SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9dd45fdf1e..7b11e1dda6 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/