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

82 files changed, 562 insertions, 152 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 9c51c0a08e..ef6c0abf8f 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -216,6 +216,9 @@ def base_package_name(d):
 		pn = pn[0:-8]
   elif pn.endswith("-intermediate"):
 		pn = pn[0:-13]
+  elif pn.endswith("-sdk"):
+		pn = pn[0:-4]
+
 
   return pn
 
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index ef16669c3d..b4987608ed 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -485,6 +485,29 @@ do_sizecheck() {
 
 addtask sizecheck before do_install after do_compile
 
+do_uboot_mkimage() {
+    if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+        ENTRYPOINT=${UBOOT_ENTRYPOINT}
+        if test -n "${UBOOT_ENTRYSYMBOL}"; then
+            ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
+                   awk '$3=="${UBOOT_ENTRYSYMBOL}" {print $1}'`
+        fi
+        if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+            ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin arch/${ARCH}/boot/uImage
+            rm -f linux.bin
+        else
+            ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+            rm -f linux.bin.gz
+            gzip -9 linux.bin
+            uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz arch/${ARCH}/boot/uImage
+            rm -f linux.bin.gz
+        fi
+    fi
+}
+
+addtask uboot_mkimage before do_install after do_compile
+
 KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
 KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
@@ -497,21 +520,6 @@ do_deploy() {
 	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
 	fi
 
-	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
-			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-			rm -f linux.bin
-		else
-			${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
-			rm -f linux.bin.gz
-			gzip -9 linux.bin
-			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-			rm -f linux.bin.gz
-		fi
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-	fi
-
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 4bb80c147f..12f0c99f4c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13054,9 +13054,9 @@ sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d
 md5=308e5746a2d0804be1d638319ad7b9c0
 sha256=bd518b930f76c976bf693c247f0742d88808c776a2aeb51ab7830dedb0eb692d
 
-[http://downloads.sourceforge.net/libdbi/libdbi-0.8.2.tar.gz]
-md5=e5b5aa098ac35e7cb921edcf8b77a865
-sha256=8d3cc69f8afc0386afdaeaab2b3558b2a4fe9a54c440dac34e3b9206d376f407
+[http://downloads.sourceforge.net/libdbi/libdbi-0.8.3.tar.gz]
+md5=ca66db78d479cbfa727cf3245b5864ae
+sha256=72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3
 
 [http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.7.1.tar.gz]
 md5=f11020119ceb7a6dee3969cb0589d4bc
@@ -13066,6 +13066,10 @@ sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8
 md5=f11020119ceb7a6dee3969cb0589d4bc
 sha256=5ae76aff042249750437ab7e490ae7d9e19a10f0005cd9bb525106365998aca8
 
+[http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz]
+md5=4de79b323162a5a7652b65b608eca6cd
+sha256=4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72
+
 [http://nchipin.kos.to/libddmpeg/libddmpeg_1.5.orig.tar.gz]
 md5=89e59638d31384987d912741986398b6
 sha256=9422e73c55aa921fbbce06e5e01bba0b98bb7a0f1640c27cfd307c290dba792c
@@ -14070,10 +14074,14 @@ sha256=4bd54929a80850754f27b568d7891e1e3e1b8d2f208d371f27d1fda09e6f12a8
 md5=dfbe478c4d4e9bf8e450c7349e104e2a
 sha256=f7e11c6137a1628d63985799ebcb78577832fca3ca4aeb2fc53d0e667cf699c0
 
-[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
+[http://www.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
 md5=54935c6cff42df2f1daada267b701392
 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
 
+[http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz]
+md5=a6f66b72898d27270e3a68007f90d62b
+sha256=071416adcae5c1a9317a4a313f2deb34667e3cc2be4487fb3076528ce45b210b
+
 [http://gpephone.linuxtogo.org/download/gpephone/libmsgenabler-1.0/libmsgenabler-1.0.tar.bz2]
 md5=32f04482d3905f05a4f36ac946e7f95d
 sha256=c8568dbd5d3ffa200bf81ffbc7baf94902b41998d5c65455a1fbadce15db9953
@@ -14186,10 +14194,14 @@ sha256=424d12aae7a6ea8c90438cf4ccff486dc01a3a2a7b68eb602ee2b8c28178b6d1
 md5=a547da766fccacd00fd05190baf644da
 sha256=54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52
 
-[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
+[http://www.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
 md5=85b6a42a9e17a23c01b2f2ed0ece0563
 sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
 
+[http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz]
+md5=857f43970e7f0724d28f4ddc87085daf
+sha256=0f9460e3ba16b347001caf6843f0050f5482e36ebcb307f709259fd6575aa547
+
 [http://www.vorbis.com/files/1.0/unix/libogg-1.0.tar.gz]
 md5=382a7089f42e6f82e7d658c1cb8ee236
 sha256=920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c
@@ -17154,6 +17166,10 @@ sha256=44fc0eddf56c0abe861190051fceec6e223122c5835967459c69fbf98ee52067
 md5=a311545a0003f1a599297d57e4e27916
 sha256=4cf6094f64f3446e83b968cbee3f0ed5d579b635644dd8cbd51bbbe184446600
 
+[http://ftp.novell.com/pub/mono/sources/mono/mono-2.4.2.3.tar.bz2]
+md5=696f25afc8453cd0d1c78de6e905dcf2
+sha256=1bab0d4e2906c88736ff5e242f2905f4c3535ccfc05bb5c427b72adf0e9236ae
+
 [http://venge.net/monotone/downloads/monotone-0.20.tar.gz]
 md5=3bdf4da35ff576a401483815952f4045
 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93
@@ -21418,6 +21434,10 @@ sha256=a98cb1d9903192c4fcf40d82c705e091a5c193f87327703217749a5f4cc6197d
 md5=4e855372c4a533b9ed605503156e6e04
 sha256=3dbd653b27fc855bf86dfe0ac06ed9bf59c8b85c9bcb4b5488528b30c59970f4
 
+[http://www.vanheusden.com/rsstail/rsstail-1.5.tgz]
+md5=1558fc8b0c9a8cb79e421f783f1ffc40
+sha256=242b3d5807e7bd753531fb836395afe18efe948174ea1ae54a4b7baba7a058fe
+
 [http://www.claws-mail.org/downloads/plugins/rssyl-0.10.tar.gz]
 md5=01a123319f2a32ecff7e560b95c2e4df
 sha256=d6bfdee4fd31c0e0089c6edab594eefaa5b7b95f0b783f1156dffadf1a90d820
@@ -23534,6 +23554,10 @@ sha256=0da9424503faad972860682107157d7348872f00f932ec270c78f17ee495dc97
 md5=5396e8d279b5140e86113c80abc041ad
 sha256=2e6a535ba29d06337daf22ae12e17cbe10e70de95134ebd7b6e8a6838e3ca5a0
 
+[http://limpens.net/trac/at91-kit-trac/export/4/trunk/sources/tinylogin-1.4.tar.bz2]
+md5=44da0ff2b727455669890b24305e351d
+sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
+
 [http://tinylogin.busybox.net/downloads/tinylogin-1.4.tar.bz2]
 md5=44da0ff2b727455669890b24305e351d
 sha256=5e542e4b7825305a3678bf73136c392feb0d44b8bbf926e8eda5453eea7ddd6b
@@ -24166,6 +24190,10 @@ sha256=4605f3f0001afd3af91ffb554dfd65c5cd313b6b9ada52ae8b2efdccf894cfa2
 md5=06966791546a7b40a2b0139fba552cb0
 sha256=f53533b44a9c17972aff6ac7047c6ac1e2e5e2930254eccdb1239678a6dd1793
 
+[http://downloads.sourceforge.net/project/infozip/UnZip%205.x%20and%20earlier/5.52/unzip552.tar.gz]
+md5=9d23919999d6eac9217d1f41472034a9
+sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
+
 [http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz]
 md5=9d23919999d6eac9217d1f41472034a9
 sha256=145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b6da1cc1e8..586bbc172a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -249,8 +249,6 @@ SRCREV_pn-toscoterm ?= "f02add76f365a2fecd2dbefc230ceaab20244f96"
 SRCREV_pn-u-boot-bug ?= "8674"
 SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
-SRCREV_pn-uclibc ?= "25712"
-SRCREV_pn-uclibc-initial ?= "25712"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
@@ -268,7 +266,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "41038"
+EFL_SRCREV ?= "41533"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 8b834d0f4a..9212aa1d12 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -93,6 +93,7 @@ PREFERRED_PROVIDER_virtual/db = "db3"
 PREFERRED_PROVIDER_virtual/db-native = "db3-native"
 PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb"
 
 #############################################################################
 # PREFERRED VERSIONS
diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index 1e639fc342..facd7a231a 100644
--- a/recipes/efl1/ecore.inc
+++ b/recipes/efl1/ecore.inc
@@ -27,6 +27,27 @@ PACKAGES =+ "\
     ${PN}-x \
     ${PN}-input \
     "
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libecore-ver-pre-svn-00-0 libecore-ver-pre-svn-01-0"
+REPLACES_${PN}-tests = "libecore-ver-pre-svn-01-tests"
+RREPLACES_${PN}-con = "libecore-ver-pre-svn-01-con libecore-con-ver-pre-svn-01-0"
+RREPLACES_${PN}-config = "libecore-config-ver-pre-svn-01-0"
+RREPLACES_${PN}-desktop = "libecore-desktop-ver-pre-svn-01-0"
+RREPLACES_${PN}-directfb = "libecore-directfb-ver-pre-svn-01-0"
+RREPLACES_${PN}-sdl = "libecore-sdl-ver-pre-svn-01-0"
+RREPLACES_${PN}-evas = "libecore-evas-ver-pre-svn-01-0"
+RREPLACES_${PN}-fb = "libecore-fb-ver-pre-svn-01-0"
+RREPLACES_${PN}-file = "libecore-file-ver-pre-svn-01-0"
+RREPLACES_${PN}-imf-evas = "libecore-imf-evas-ver-pre-svn-01-0"
+RREPLACES_${PN}-imf = "libecore-imf-ver-pre-svn-01-0"
+RREPLACES_${PN}-ipc = "libecore-ipc-ver-pre-svn-01-0"
+RREPLACES_${PN}-job = "libecore-job-ver-pre-svn-01-0"
+RREPLACES_${PN}-txt = "libecore-txt-ver-pre-svn-01-0"
+RREPLACES_${PN}-x = "libecore-x-ver-pre-svn-01-0"
+RREPLACES_${PN}-input = "libecore-input-ver-pre-svn-01-0"
+
 FILES_${PN} = "${libdir}/libecore*.so.*"
 FILES_${PN}-con = "${libdir}/libecore_con*.so.*"
 FILES_${PN}-config = "${libdir}/libecore_config*.so.*"
@@ -43,3 +64,6 @@ FILES_${PN}-job = "${libdir}/libecore_job*.so.*"
 FILES_${PN}-txt = "${libdir}/libecore_txt*.so.*"
 FILES_${PN}-x = "${libdir}/libecore_x*.so.*"
 FILES_${PN}-input = "${libdir}/libecore_input*.so.*"
+
+
+
diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb
index 2509c859c7..7f94b08256 100644
--- a/recipes/efl1/edje_svn.bb
+++ b/recipes/efl1/edje_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.9.92.060+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit efl
 
@@ -20,6 +20,11 @@ RRECOMMENDS_${PN}-utils = "\
 "
 
 DEBIAN_NOAUTONAME_${PN}-utils = "1"
+# Some upgrade path tweaking
+AUTO_LIBNAME_PKGS = ""
+
+RREPLACES_${PN} = "libedje-ver-pre-svn-00-0 libedje-ver-pre-svn-