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

23 files changed, 95 insertions, 68 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 6ded5a9a5d..0b05edff44 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21162,7 +21162,7 @@ sha256=489bb2f9fb69922e9befc27ae1b8d19d31c83c586f55b7ecc503cb4f5e767da4
 md5=6df271fd6a92d7641d7b060dedf7fec6
 sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1
 
-[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2]
+[http://www.dest-unreach.org/socat/download/Archive/socat-1.3.2.1.tar.bz2]
 md5=860fe417ea5e9ca2d2b2225192b85b87
 sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a
 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 88b3487451..cf66f0028b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -64,6 +64,8 @@ SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
 SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
 SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
+SRCREV_pn-gabriel ?= "38"
+SRCREV_pn-gabriel-native ?= "38"
 GCCREV ?= "145550"
 SRCREV_pn-gcc ?= ${GCCREV}
 SRCREV_pn-gcc-cross ?= ${GCCREV}
@@ -241,7 +243,7 @@ SRCREV_pn-uclibc-initial ?= "25712"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
-SRCREV_pn-vala-native ?= "54a924505856a839ad02dc95baa482e994e94a57"
+SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
 SRCREV_pn-webkit-gtk ?= "42127"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index a0ec5fdda4..8d1eb899de 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,6 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
-MACHINE_KERNEL_PR = "r22" 
+# Increase this everytime you change something in the kernel
+MACHINE_KERNEL_PR = "r23" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index e3942534dc..8b4cb2ea1e 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -278,6 +278,7 @@ do
                       subversion \
                       sugar \
                       sylpheed \
+                      systray \
                       task-gpe-pim \
                       task-openmoko-feed \
                       task-openmoko-games \
diff --git a/recipes/e17/systray_svn.bb b/recipes/e17/systray_svn.bb
new file mode 100644
index 0000000000..3c0a8c7e71
--- /dev/null
+++ b/recipes/e17/systray_svn.bb
@@ -0,0 +1,8 @@
+LICENSE = "MIT"
+PV = "0.0.1+svnr${SRCREV}"
+
+require e-module.inc
+
+
+
+
diff --git a/recipes/gabriel/gabriel-native_svn.bb b/recipes/gabriel/gabriel-native_svn.bb
new file mode 100644
index 0000000000..a98abb028e
--- /dev/null
+++ b/recipes/gabriel/gabriel-native_svn.bb
@@ -0,0 +1,13 @@
+require gabriel_svn.bb
+inherit native
+DEPENDS = "libssh-native glib-2.0-native dbus-native dbus-glib-native"
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_TOOLS}
+	install -m 0755 src/gabriel ${DEPLOY_DIR_TOOLS}/gabriel-${PV}
+	rm -f ${DEPLOY_DIR_TOOLS}/gabriel
+	ln -sf ./gabriel-${PV} ${DEPLOY_DIR_TOOLS}/gabriel
+}
+                                
+
+addtask deploy before do_package after do_install
diff --git a/recipes/gabriel/gabriel_svn.bb b/recipes/gabriel/gabriel_svn.bb
new file mode 100644
index 0000000000..1449311f90
--- /dev/null
+++ b/recipes/gabriel/gabriel_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Gabriel is a small utility to enable D-Bus clients to connect to a D-Bus \
+daemon running on a remote machine, through SSH. In simple words, gabriel is a proxy for \
+a dbus daemon running on a remote machine."
+LICENSE = "GPL"
+DEPENDS = "libssh glib-2.0 dbus glib-dbus"
+SECTION = "console/network"
+PV = "0.0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://gabriel.svn.sourceforge.net/svnroot/gabriel;module=gabriel;proto=https"
+S = "${WORKDIR}/gabriel"
+
+inherit autotools_stage
+
+RDEPENDS = "socat"
diff --git a/recipes/libssh/libssh-native_0.2.bb b/recipes/libssh/libssh-native_0.2.bb
new file mode 100644
index 0000000000..289161d329
--- /dev/null
+++ b/recipes/libssh/libssh-native_0.2.bb
@@ -0,0 +1,4 @@
+require libssh_${PV}.bb
+inherit native
+DEPENDS = ""
+
diff --git a/recipes/libssh/libssh_0.11.bb b/recipes/libssh/libssh_0.11.bb
deleted file mode 100644
index 833567ebb0..0000000000
--- a/recipes/libssh/libssh_0.11.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-SECTION = "libs"
-DESCRIPTION = "The SSH library is a C library to authenticate in a \
-simple manner to one or more SSH servers. The goal of this project \
-is to provide a library much simpler to use than OpenSSHs one. It \
-includes SFTP support, and a sample SSH client is provided."
-DEPENDS = "openssl"
-LICENSE = "LGPL"
-
-DEFAULT_PREFERENCE="-1"
-
-SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz"
-
-inherit autotools
-
-EXTRA_OECONF = "--cache-file=${S}/config.cache"
-
-do_stage () {
-	set -x
-	install -d ${STAGING_INCDIR}/libssh
-	for i in crypto.h libssh.h sftp.h ssh2.h; do
-		install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/
-	done
-	oe_libinstall -so -C libssh libssh ${STAGING_LIBDIR}
-}
-
-do_install () {
-	oe_runmake "prefix=${D}${prefix}" \
-		   "exec_prefix=${D}${exec_prefix}" \
-		   "bindir=${D}${bindir}" \
-		   "incldir=${D}${includedir}" \
-		   "infodir=${D}${infodir}" \
-		   "mandir=${D}${mandir}/man1" \
-		   "libdir=${D}${libdir}" \
-		   install
-}
diff --git a/recipes/libssh/libssh_0.2.bb b/recipes/libssh/libssh_0.2.bb
index b776094018..fb0c4c300c 100644
--- a/recipes/libssh/libssh_0.2.bb
+++ b/recipes/libssh/libssh_0.2.bb
@@ -1,24 +1,25 @@
-# Released under the MIT license (see COPYING.MIT for the terms)
-
 DESCRIPTION = "The SSH library is a C library to authenticate in a \
 simple manner to one or more SSH servers. The goal of this project \
 is to provide a library much simpler to use than OpenSSHs one. It \
 includes SFTP support, and a sample SSH client is provided."
-
 HOMEPAGE = "http://0xbadc0de.be/wiki/libssh:libssh"
 LICENSE = "LGPL"
 SECTION = "libs"
 DEPENDS = "openssl"
-SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \
-	   file://libssh_libdir_fix.patch;patch=1 \
-	  "
+
+SRC_URI = "\
+  http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \
+  file://libssh_libdir_fix.patch;patch=1 \
+"
 inherit autotools
 
 EXTRA_OECONF = "--cache-file=${S}/config.cache"
+
 do_compile () {
 	oenote make "$@"
 	make "$@" || die "oe_runmake failed"
 }
+
 do_stage () {
 	install -d ${STAGING_INCDIR}/libssh
 	for i in crypto.h libssh.h sftp.h ssh2.h; do
diff --git a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch
new file mode 100644
index 0000000000..d778423d1b
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch
@@ -0,0 +1,13 @@
+--- orig/drivers/video/modedb.c.orig	2009-04-07 11:40:10.000000000 +0200
++++ git/drivers/video/modedb.c	2009-04-07 10:35:29.000000000 +0200
+@@ -44,6 +44,10 @@
+ 	NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
+ 	0, FB_VMODE_NONINTERLACED
+     }, {
++	/* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */
++	"hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5,
++	0, FB_VMODE_NONINTERLACED
++    }, {
+ 	/* 800x600 @ 56 Hz, 35.15 kHz hsync */
+ 	NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2,
+ 	0, FB_VMODE_NONINTERLACED
diff --git a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch
new file mode 100644
index 0000000000..d778423d1b
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch
@@ -0,0 +1,13 @@
+--- orig/drivers/video/modedb.c.orig	2009-04-07 11:40:10.000000000 +0200
++++ git/drivers/video/modedb.c	2009-04-07 10:35:29.000000000 +0200
+@@ -44,6 +44,10 @@
+ 	NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2,
+ 	0, FB_VMODE_NONINTERLACED
+     }, {
++	/* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */
++	"hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5,
++	0, FB_VMODE_NONINTERLACED
++    }, {
+ 	/* 800x600 @ 56 Hz, 35.15 kHz hsync */
+ 	NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2,
+ 	0, FB_VMODE_NONINTERLACED
diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb
index 92de11eb9b..fe586e0f12 100644
--- a/recipes/linux/linux-omap_2.6.28.bb
+++ b/recipes/linux/linux-omap_2.6.28.bb
@@ -53,6 +53,7 @@ SRC_URI_append = " \
            file://ioremap-fix.patch;patch=1 \
            file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
            file://mmctiming.patch;patch=1 \
+           file://modedb-hd720.patch;patch=1 \
 "
 
 
diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb
index bb7f2a416b..0948e46060 100644
--- a/recipes/linux/linux-omap_2.6.29.bb
+++ b/recipes/linux/linux-omap_2.6.29.bb
@@ -101,6 +101,7 @@ SRC_URI_append = " \
 #           file://isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch;patch=1 \
 #           file://isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch;patch=1 \
            file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \
+           file://modedb-hd720.patch;patch=1 \
 "
 
 
diff --git a/recipes/socat/socat-1.3.2.1/ldflags.patch b/recipes/socat/files/ldflags.patch
index 6ab4681383..6ab4681383 100644
--- a/recipes/socat/socat-1.3.2.1/ldflags.patch
+++ b/recipes/socat/files/ldflags.patch
diff --git a/recipes/socat/socat-1.3.2.1/xioinitialize.patch b/recipes/socat/files/xioinitialize.patch
index 24e816cfd7..24e816cfd7 100644
--- a/recipes/socat/socat-1.3.2.1/xioinitialize.patch
+++ b/recipes/socat/files/xioinitialize.patch
diff --git a/recipes/socat/socat-1.3.2.1/xioopen.patch b/recipes/socat/files/xioopen.patch
index 456862653a..456862653a 100644
--- a/recipes/socat/socat-1.3.2.1/xioopen.patch
+++ b/recipes/socat/files/xioopen.patch
diff --git a/recipes/socat/socat_1.3.2.1.bb b/recipes/socat/socat_1.3.2.1.bb
index 612987858b..c30fb7a0ec 100644
--- a/recipes/socat/socat_1.3.2.1.bb
+++ b/recipes/socat/socat_1.3.2.1.bb
@@ -5,11 +5,10 @@ transfer between two independent data channels."
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
+SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2 \
            file://xioopen.patch;patch=1 \
            file://ldflags.patch;patch=1 \
            file://xioinitialize.patch;patch=1"
-
 S = "${WORKDIR}/socat-1.3"
 
 inherit autotools
diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb
index 889cd77384..e05fa398b7 100644
--- a/recipes/tasks/task-cli-tools.bb
+++ b/recipes/tasks/task-cli-tools.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A set of command line tools, python tools-based tools, debug tool
 SECTION = "console"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r6"
+PR = "r7"
 
 inherit task
 
@@ -18,6 +18,7 @@ RDEPENDS_${PN} = "\
   nfs-utils-client \
   powertop \
   screen \
+  socat \
   sysstat \
   tcpdump \
 "
diff --git a/recipes/vala/vala-bootstrap-native_0.6.0.bb b/recipes/vala/vala-bootstrap-native_0.6.0.bb
new file mode 100644
index 0000000000..bc99ebf0a6
--- /dev/null
+++ b/recipes/vala/vala-bootstrap-native_0.6.0.bb
@@ -0,0 +1,4 @@
+require vala_${PV}.bb
+
+inherit native
+DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala-native_0.5.7.bb b/recipes/vala/vala-native_0.5.7.bb
deleted file mode 100644
index 735c93f3f6..0000000000
--- a/recipes/vala/vala-native_0.5.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require vala_${PV}.bb
-
-inherit native
-DEPENDS = "glib-2.0-native"
-
-# work around timestamp problem in tarball
-do_compile_prepend() {
-	touch gobject/gobject.vala.stamp
-}
-    
diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb
index 66abd5e292..545849b9d3 100644
--- a/recipes/vala/vala-native_git.bb
+++ b/recipes/vala/vala-native_git.bb
@@ -1,17 +1,13 @@
-require vala_0.5.7.bb
-# vala from git always needs the latest released version to compile itself
-DEPENDS = "vala-native"
-
-SRCREV = "e7462e3ed00b75c16c11c27f6d8a640c7f35fafc"
-PV := "0.5.7+0.5.8pre02-gitr${SRCREV}"
+require vala.inc
+inherit native
 
-DEFAULT_PREFERENCE = "-1"
+DEPENDS = "glib-2.0-native"
+# vala from git always needs the latest released version to compile itself
+DEPENDS += "vala-bootstrap-native"
+PV = "0.6.0-fso1-gitr${SRCREV}"
 
 SRC_URI = "\
-  ${FREESMARTPHONE_GIT}/vala;protocol=git;branch=master \
+  ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \
   file://static-dbus-methods.patch;patch=1 \
 "         
 S = "${WORKDIR}/git"
-
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/recipes/vala/vala_0.5.7.bb b/recipes/vala/vala_0.6.0.bb
index 7b2b4e293c..7b2b4e293c 100644
--- a/recipes/vala/vala_0.5.7.bb
+++ b/recipes/vala/vala_0.6.0.bb