Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev

6 files changed, 32 insertions, 30 deletions

diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 6e8c93a95a..368f766a5b 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -229,6 +229,9 @@ PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
 PREFERRED_VERSION_libpciaccess ?= "0.10.9"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_mesa-dri ?= "7.2"
+PREFERRED_VERSION_mesa-xlib ?= "7.2"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index d4dfd87521..3b58c1ac25 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,47 +1,47 @@
 # To be included from sane-srcrevs.inc
 
 # FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
+FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
-SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsotdld ?= "5702931bf6a2a796fde6abdf1909d5901216bee7"
-SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
-SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14"
-SRCREV_pn-libfsoframework ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
+SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819"
+SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5"
 SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
-SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30"
+SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
 SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
 SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
 SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
+SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
-SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
+SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb"
+SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3"
 SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d"
 SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
-SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
-SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
+SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9"
+SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
 SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" 
-SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f"
 SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
-SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0"
+SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f"
 SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3cddffda50..7f1f7742ce 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -149,8 +149,8 @@ SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca"
-SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
-SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
+SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
@@ -181,7 +181,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2890"
+SRCREV_pn-navit ?= "2902"
 SRCREV_pn-navit-icons ?= "2871"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-neomis ?= "6"
@@ -280,8 +280,10 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
 SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
-SRCREV_pn-remoko ?= "148"
-SRCREV_pn-remoko-server ?= "148"
+SRCREV_pn-qtwebkit-performance-utilities ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
+SRCREV_pn-qtwebkit-performance-utilities-e ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
+SRCREV_pn-remoko ?= "121"
+SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
 SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
@@ -301,7 +303,7 @@ SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb"
 SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
 SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b"
@@ -332,7 +334,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 ?= "44908"
+EFL_SRCREV ?= "44950"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 4d790f4e1f..03595dba1d 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -182,10 +182,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 2ef04872fb..0e8e272b11 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -54,6 +54,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
+PREFERRED_VERSION_linux-libc-headers = "2.4.18"
 
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 #INHIBIT_PACKAGE_STRIP = "1"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index b99c895dc2..74526d0296 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -25,8 +25,8 @@ DISTRO_NAME = "shr"
 DISTRO_VERSION = "-${DATE}"
 DISTRO_REVISION = "2"
 DISTRO_PR = ".4"
-#DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
+DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
 DISTRO_SSH_DAEMON = "openssh"