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

7 files changed, 79 insertions, 15 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9364c2cc77..2dcb04380d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -58,6 +58,10 @@ sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
 md5=f13ab353b11329ce3d605b6f40e77fa6
 sha256=41991e8aa2e5fe8e5dfd47b1e5c446fa03c3ee96a5eae54fd6ec15d1d9afef30
 
+[http://www.ralinktech.com.tw/data/drivers/2009_0525_RT3070_Linux_STA_v2.1.1.0.tar.bz2]
+md5=705c5f8ba0f8a378218fef74859335f5
+sha256=b2a24265bb29f4d429ec42fefbfc545b898c8c046c01c577ca08d9cc65c860d7
+
 [http://hg.openjdk.java.net/hsx/hsx14/master/archive/25a020f13592.tar.gz]
 md5=dbd7aca5544d1aeebf0eadd45d29d08e
 sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178
@@ -2526,7 +2530,11 @@ sha256=0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782
 md5=e240c34f979b64bcb83c5f6567110bb1
 sha256=46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
 
-[http://downloads.open-mesh.net/batman/stable/sources/batman-0.3.tar.gz]
+[http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.2.tar.gz]
+md5=3f2f6b408828d34c5c2f1445e744e6ac
+sha256=2b0f22efc1bda016649db8d6e1214e381d034befa9c9835c3a6a75d5f95cf931
+
+[http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz]
 md5=54812e81f70a4155edcce88f0c7aeb02
 sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
 
@@ -8190,6 +8198,14 @@ sha256=af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9
 md5=5092c5b479ba80065dc164d27e63000f
 sha256=b772e4bdf1b28dd23cdb4c4d7f1d219ddb748226d0207e57c75992bf0100182d
 
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.21/glib-2.21.6.tar.bz2]
+md5=3b0452fbd877db53dafabdc074600cb8
+sha256=8b4750523a07102c90c7eecf1743f852ce2aadcb7a43284a9e06baf70beb9b8a
+
+[http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-2.22.0.tar.bz2]
+md5=e0bc5b08d467cc3763550923087772d3
+sha256=f77cda95fa7cea5e7ad189ac18a165bb3886a66bc5f97c6398a9e5dc16c8a671
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/glib-2.4.6.tar.bz2]
 md5=a45db7d82480da431f6cd00ea041a534
 sha256=d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2
@@ -10438,6 +10454,10 @@ sha256=afcdc5b67974054b111a4c283641303647d1ffa5677ffb8c4ce8621f12e17f88
 md5=416412b336d9f3b6b78ca887395d1726
 sha256=18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
 
+[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.0.tar.bz2]
+md5=bb7ef5463a74a80454ced2c1d47a0192
+sha256=05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -12286,9 +12306,9 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
 md5=b4f7ffcc294d41a6a4c40d6e44b7734d
 sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
 
-[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz]
-md5=bf87c53f36b4454ad3cc50aa9c72faf3
-sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2
+[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.1.tar.gz]
+md5=a7710a89fb0096002bccc57ab202a874
+sha256=95f352870df977271d912b6093f034bd3345e47a157493db96d1047b7654564d
 
 [http://kexecboot.home.linuxtogo.org/kexecboot-0.3.tar.gz]
 md5=3c3b8edb739146183b3ddff3e0af5f1c
@@ -16062,6 +16082,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
 md5=f0e143ed696bb064804cf0970718b414
 sha256=7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac
 
+[http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz]
+md5=1c5547aa497a7eae9fa52ed4df4b0f11
+sha256=5f7c232f9216ce45f0ab0045098cd2b21b6f2f8a7668bffd2e06040a5b87ba84
+
 [http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2]
 md5=952715cc523f4a77e7c5f94f608594c0
 sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d
@@ -21282,6 +21306,10 @@ sha256=bce93266c593d79d7083052a6cae516de3d6c3e5bda277f664785d30157b8ac7
 md5=0df3d1c5109bb88d06575d70513a190c
 sha256=8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8
 
+[http://download.sugarlabs.org/sources/external/python-xklavier/python-xklavier-0.2.tar.gz]
+md5=5b3cd1832f4d37dfa48490759f3bd3be
+sha256=b71096448ca9d7933fbc4aff13cef95a5878f49e4c25f20f815dd1f8f635b6d6
+
 [http://downloads.sourceforge.net/python-xlib/python-xlib-0.14.tar.gz]
 md5=a038c2f410d8445f3fa8f6dcd45659c5
 sha256=4771b0b6a605e0197ece5432fa601c61df724b32544239f463a867200f2160eb
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 0c0c83117e..03e5c8ec23 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -6,12 +6,12 @@ PREFERRED_VERSION_cairo		= "1.8.0"
 PREFERRED_VERSION_dbus 		= "1.2.1"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
-PREFERRED_VERSION_glib-2.0 	= "2.21.4"
-PREFERRED_VERSION_glib-2.0-native = "2.18.0"
+PREFERRED_VERSION_glib-2.0 	= "2.22.0"
+PREFERRED_VERSION_glib-2.0-native = "2.22.0"
 PREFERRED_VERSION_glibmm = "2.18.0"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.16.6"
+PREFERRED_VERSION_gtk+		= "2.18.0"
 PREFERRED_VERSION_gtkmm		= "2.14.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 956e1fbe22..ce6e4bceb1 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -115,18 +115,20 @@ SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
-SRCREV_pn-matchbox-desktop-2 ?= "1778"
+SRCREV_pn-matchbox-desktop-2 ?= "2096"
 SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
-SRCREV_pn-matchbox-panel-2 ?= "1626"
+SRCREV_pn-matchbox-panel-2 ?= "2098"
+SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-matchbox-terminal ?= "1612"
+SRCREV_pn-matchbox-wm-2 ?= "2087"
 SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "29653"
+SRCREV_pn-mplayer ?= "29716"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-multitap-pad ?= "373"
@@ -246,7 +248,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "41533"
+EFL_SRCREV ?= "42645"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index c52cbddf18..d52bc99a7d 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r45" 
+MACHINE_KERNEL_PR = "r46" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 37e39dce3f..3595383f03 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -7,6 +7,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-input-mouse \
+           xf86-input-tslib \
            xf86-video-omapfb \
            xf86-input-keyboard"
 
@@ -15,6 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen"
 
 require conf/machine/include/omap3.inc
 
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-pm"
+
 IMAGE_FSTYPES += "squashfs tar.bz2 ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
 
@@ -42,6 +45,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 PREFERRED_VERSION_u-boot = "git"
 
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+MACHINE_EXTRA_RRECOMMENDS = " rt3070 omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/omap3517-evm.conf b/conf/machine/omap3517-evm.conf
index 4bbd25c718..77ea2807b9 100644
--- a/conf/machine/omap3517-evm.conf
+++ b/conf/machine/omap3517-evm.conf
@@ -19,9 +19,9 @@ require conf/machine/include/omap3.inc
 MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
+EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyS2"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
 
diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf
new file mode 100644
index 0000000000..fe3c2794ee
--- /dev/null
+++ b/conf/machine/palmpre.conf
@@ -0,0 +1,31 @@
+#@TYPE: Machine
+#@NAME: Palm Pre machine
+#@DESCRIPTION: Machine configuration for the Palm Pre handset
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "185"
+
+require conf/machine/include/omap3.inc
+
+# Put it below omap3.inc as we override the kernel here
+PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre"
+
+
+IMAGE_FSTYPES += "tar.bz2"
+
+# Let's keep the following three from the beagleboard machine config
+UBOOT_MACHINE = "omap3_beagle_config"
+PREFERRED_VERSION_u-boot = "git"
+MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
+
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi"