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

10 files changed, 75 insertions, 22 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index eb3ea8e88b..93e3738bca 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -662,6 +662,10 @@ sha256=4d8187c484a28c32f843b929b244bb2da07d74f7fdc2c49f843a555464f75236
 md5=a335d299bb7e14d910c600d0975dd375
 sha256=84eb13052bf4d41c26bf689f4bf58cb8036b9846f0d1693073b89e3d125793f3
 
+[http://www.packagekit.org/releases/PackageKit-0.4.6.tar.gz]
+md5=66ef4281047ad51f499ec05420028f11
+sha256=4e44eb7be990cb62e57840f4b01b6c9af06c4655869d0cb565fc45749c20b82e
+
 [http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-0.20.tar.gz]
 md5=33c4466239c97cc3e1063eff0577206c
 sha256=29f7e05045a5699b211d2a8332d36113c22f9c2e96174f40939e79dbc356905d
@@ -2706,6 +2710,14 @@ sha256=5a2e6e83062699fb01babfb5b211054e01dde097d3b31767135be5447bb05bde
 md5=53a3347a1c38971bee4c4016b45bcf6d
 sha256=f6cfceb541a10849805f853b790bc8343309e7b21078a9c18a7a6a8cf2f94e3b
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.34.tar.gz]
+md5=2435f7a932cdeecce01211e06142795f
+sha256=1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40
+
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.35.tar.gz]
+md5=5919d6383cd9446f8b90fdca748dc961
+sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -7962,6 +7974,10 @@ sha256=98e4202a7745e0533c7a665fc6d2cc6b4ee851debf159a61d8de706b952ac748
 md5=17ba571e5dd83434dc5b2b06ada7b56e
 sha256=b71f89f9ead65a7d3ccb92f6a6c2fb1719be25d6661dd67a14b5d820ee6831b2
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.26/gnome-icon-theme-2.26.0.tar.bz2]
+md5=36a4e5e1b2c7c053779a9a399f6146a2
+sha256=4320c937d4d211ac39633aa39b55e770b9a996697c857e2b8033c40323384709
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.2/gnome-keyring-0.2.1.tar.bz2]
 md5=2fe5fb39cc18d1a6792fd3281223dfff
 sha256=1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612
@@ -8014,6 +8030,10 @@ sha256=b3ef17eb05308e35e1627e5ca56b6951e9aea69cf112164ef698cdad6f44ed23
 md5=1816a0d21ef99d5b3a8bcd033c88f732
 sha256=f19ac5af961be1d6244f9526311af8a67518c7403ef71209dcee94b68f77d58e
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-menus/2.26/gnome-menus-2.26.0.tar.bz2]
+md5=55fd07e67d8334de2e03e4e23c011452
+sha256=84a97b6d74b14e27888a0f54759e570cb701400c5b176471871bc08a6acafb15
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2]
 md5=541858188f80090d12a33b5a7c34d42c
 sha256=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
@@ -8034,6 +8054,10 @@ sha256=015f415748fa90d51b2bfd2dd41906ee918eb4e5d900d7b6b3ac698e4016e5c0
 md5=05b03bd236a5bda56ea85122f356a68f
 sha256=ff507ea3421f410ab0faf59b6146f65fa073b01c556f017ce211557b51ba3804
 
+[http://www.packagekit.org/releases/gnome-packagekit-2.27.1.tar.gz]
+md5=7a38bcdfda3e712365f674c51565e845
+sha256=1d77646aa7291dcf8e5ab78955f5e5755faac982e795fa70f7ecf5aa98da6f9e
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.10/gnome-panel-2.10.1.tar.bz2]
 md5=a2719f5c79a9e48bca086f08a77a6889
 sha256=dc60f7f6e9b9ce52ad4e2ce1f7d6dca643590e86e49c749d513d9f8a25068a7a
@@ -9866,6 +9890,10 @@ sha256=67e7dd1dca32a99eb1102a853d2df1bac782d50a4361511409572cfe8ea51147
 md5=a41e8b7d99e390cef8312f7ce5f312a5
 sha256=17eccded6e096208181e2c7625802526112af23f5b2c7b2a672ab9ccff3a55fd
 
+[http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.2/gvfs-1.2.1.tar.bz2]
+md5=df8f624587adfabe7009838ce6d8d5fd
+sha256=0e3c3469721ff1d4296bf4af7e1f131201d2dc6a36c772d99e1630f8cce31da2
+
 [http://sebdelestaing.free.fr/gweled/Release/gweled-0.5.tar.gz]
 md5=238f5ef66317bb24c3d4018a7d1e9ec3
 sha256=d5baec578b22407e3fc78cc47393942f9704f1ab7b8d1c012577037d3421f90e
@@ -14866,11 +14894,7 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 md5=64921b5ff5cdadbccfcd3820f03be7d8
 sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
 
-[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
-md5=05daeda25430fd13bbdb47b3481f7320
-sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
-
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
+[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
 
@@ -16578,6 +16602,10 @@ sha256=2e56fe35b6f3b93dac201c55764b8bf6d899c995e0d165381368cfca886c6739
 md5=66fa4f8efdeb993b2f280e1bdc664130
 sha256=0ae0d53ecafdaa9cac7c62aafe8898fe0f5df30ee128385a4895be552721d524
 
+[http://downloads.sourceforge.net/sourceforge/mtkbabel/mtkbabel-0.8.tar.gz]
+md5=d5518b678bffb58ceeae898d950ee27e
+sha256=591597c0787822c9fd56c7a3da214e81edd3c98f32d16858221e02dfc0f63779
+
 [http://mtools.linux.lu/mtools-3.9.11.tar.gz]
 md5=3c0ae05b0d98a5d3bd06d3d72fcaf80d
 sha256=3415d425d37338aa4e18e7d60147db23cfbe6192565c697f201f44426665ce42
@@ -16714,6 +16742,10 @@ sha256=48f1d25af102d216fdc2ebcd6396ffce963558c119b88730dc02fb1c158fcc4c
 md5=783e5f7be6391d6c46b4725e38af475a
 sha256=a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
 
+[http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.26/nautilus-2.26.1.tar.bz2]
+md5=5d75f5de2806e9003e36a4613866b8d1
+sha256=86c8839ad5c8a1c5674eb3617bbe15e9c9bb2358a7435a0e2d22cd25ab7718ff
+
 [http://ftp.gnome.org/pub/GNOME/sources/nautilus/2.6/nautilus-2.6.1.tar.bz2]
 md5=50c5732c0c9736b7026bce1c6b0007dc
 sha256=83f1d6623e142af30a9b3fa9135ecf973fbb8c89f1dc36a218de0c0fef6ddf07
@@ -17142,6 +17174,14 @@ sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4
 md5=b79146369fc76a61d6d4056a937c71c8
 sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
 
+[http://tadas.dailyda.com/software/obex-data-server-0.4.4.tar.gz]
+md5=4aad0182812c770dde21246522be9f5e
+sha256=aa567d986c74a4c8b4abb1cc454c099f67ab01b049b4c69aa6e703c7f18b594d
+
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.10.tar.gz]
+md5=b9fbc1386b24f59b36aeb9d764c11fb5
+sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -17158,6 +17198,10 @@ sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
 md5=d167cfdea244e3a5f973a7b16864419c
 sha256=09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
 
+[http://downloads.sourceforge.net/openobex/obexftp-0.23.tar.bz2]
+md5=f20762061b68bc921e80be4aebc349eb
+sha256=44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
+
 [http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz]
 md5=edb66ba97fe6c84b6160c670c4bcdea8
 sha256=341c6865aa392b6cf056e1bd9cda53d2f31a942460087ad22d6f6dc91bb0bd0e
@@ -17402,6 +17446,10 @@ sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
 md5=feaa5dfe5151c0e70e8f868fa4648a43
 sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23
 
+[http://www.kernel.org/pub/linux/bluetooth/openobex-1.5.tar.gz]
+md5=0d83dc86445a46a1b9750107ba7ab65c
+sha256=e602047570799a47ecb028420bda8f2cef41310e5a99d084de10aa9422935e65
+
 [http://www.openpbx.org/releases/openpbx.org-1.2_rc3.tar.gz]
 md5=e270c40626dfa2131cc39dd1352b46f9
 sha256=934e1e5438c46927236f1f3254265e94c7e38e7c0e02d92abb7efc4e03ce91e9
@@ -18142,6 +18190,10 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
 md5=26f67d99666834cc579094619821d3c8
 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
+md5=05daeda25430fd13bbdb47b3481f7320
+sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -23798,6 +23850,10 @@ sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
 md5=43cbe5c7508f7dc3e141c346a897fbe7
 sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43
 
+[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.gz]
+md5=05b32ca051651f4b1885a90f62969faf
+sha256=4a65573bc12e15b21a4acdce89e7e6b71edbe214817457f90fcf855220bafe66
+
 [http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.9.tar.gz]
 md5=3ad40ea2b1728eefa94f60beb9951ff7
 sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index e3e36d5c59..37cb8f068a 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -163,6 +163,7 @@ PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
 PREFERRED_PROVIDER_libxss                = "libxss"
 PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
+PREFERRED_PROVIDER_bluez-libs            = "bluez4"
 
 # we don't ship gtk-directfb by default
 PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 5cb20101a5..e3e21872b7 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1326,7 +1326,7 @@ PREFERRED_VERSION_net-snmp ?= "5.4.1"
 PREFERRED_VERSION_net-tools ?= "1.60"
 PREFERRED_VERSION_network-manager-applet ?= "0.6.5"
 PREFERRED_VERSION_network-suspend-scripts ?= "1.1"
-PREFERRED_VERSION_nfs-utils ?= "1.0.6"
+PREFERRED_VERSION_nfs-utils ?= "1.1.2"
 PREFERRED_VERSION_ngrep ?= "1.42"
 PREFERRED_VERSION_nis-all ?= "1.0"
 PREFERRED_VERSION_nkf ?= "2.07"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1f7a5fdf5b..333abf423c 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,7 +42,7 @@ SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-eglibc ?= "8139"
 SRCREV_pn-eglibc-initial ?= "8139"
 SRCREV_pn-enlazar ?= "37"
-SRCREV_pn-essential-dialer ?= "60"
+SRCREV_pn-essential-dialer ?= "111"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
@@ -88,7 +88,7 @@ SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libeflvala ?= "788101c237133747ee330142b4900774dd282a7c"
-SRCREV_pn-libefso ?= "60"
+SRCREV_pn-libefso ?= "111"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
@@ -118,6 +118,7 @@ SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
+SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
@@ -256,7 +257,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "39886"
+EFL_SRCREV ?= "39916"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
@@ -308,6 +309,7 @@ SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
 SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
 SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
 SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
 SRCREV_pn-examine ?= "${EFL_SRCREV}"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index ecfd2d4fee..f82d446d68 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -5,7 +5,6 @@
 TARGET_ARCH = "avr32"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 #don't try to access tty1
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 3b06e8fcf7..fdf4dafdf8 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 = "r25" 
+MACHINE_KERNEL_PR = "r26" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 714380e9aa..cc58c4a48b 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,7 +1,7 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT = "0x80008000"
-UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ENTRYPOINT = "0xA0008000"
+UBOOT_LOADADDRESS = "0xA0008000"
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 99d92d5512..16d28ba6a3 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -28,11 +28,4 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-
-#UBOOT_ARCH = "arm"
-#UBOOT_MACHINE = "omap3_pandora_config"
-
-#EXTRA_IMAGEDEPENDS += "u-boot-omap3 x-load"
-
-
 MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen bluetooth wifi"
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
index cb32539928..a703a898d0 100644
--- a/conf/machine/overo.conf
+++ b/conf/machine/overo.conf
@@ -12,7 +12,6 @@ UBOOT_MACHINE_overo = "omap3_overo_config"
 SERIAL_CONSOLE = "115200 ttyS2"
 
 IMAGE_FSTYPES += "tar.bz2"
-EXTRA_IMAGEDEPENDS += " u-boot-omap3 x-load"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
diff --git a/conf/machine/palmt650.conf b/conf/machine/palmt650.conf
index 272c0dca1c..f81ade3d2e 100644
--- a/conf/machine/palmt650.conf
+++ b/conf/machine/palmt650.conf
@@ -12,6 +12,9 @@ GUI_MACHINE_CLASS = "bigscreen"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-snd-pxa2xx-ac97 \
                            kernel-module-pxa27x-keyboard \
-                           kernel-module-wm97xx-ts"
+                           kernel-module-wm97xx-ts \
+			   "
+
+MACHINE_EXTRA_RDEPENDS += "palmt650-keyboard-modmap"
 
 module_autoload_g_ether = "g_ether"