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

15 files changed, 144 insertions, 31 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ecbf35b6ca..e42c704bd5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2742,6 +2742,10 @@ sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
 md5=c1106f56f8e5562cf7c49d3455d2c5f7
 sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.39.tar.gz]
+md5=ba06291b737077332e914d6d653501c6
+sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -3698,6 +3702,14 @@ sha256=202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317
 md5=bd47f80a855d3203fcf10365e79d85e4
 sha256=9de3e621d7acabb161b5926565a9c9373fedbc632222018f692346790149545d
 
+[http://www.cmake.org/files/v2.2/cmake-2.2.3.tar.gz]
+md5=c0b57a115e24005f9828ca7b53908779
+sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
+
+[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
+md5=4476c423b8f74266136964e42ea88028
+sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+
 [http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz]
 md5=f5dd061c31765a49dc17ae8bdc986779
 sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
@@ -3726,6 +3738,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797
 md5=d8f3bbfbcc337d9776991d9561f451f3
 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d
 
+[http://install.tarball.in.source.dir/codec_engine_2_23_01.tar.gz]
+md5=581f548714a53d818ac355a1e4aacfa4
+sha256=32c96ec23642d827bcbc865ac490fe7f2eeec2e04448980c4eb70d0fb25f74d8
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec-r1.patch]
 md5=ed96c1bddce4b7e40a40bad1d3cd63b5
 sha256=c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971
@@ -3890,6 +3906,10 @@ sha256=79e7d8948e11b94ced41f030c495706baca4bd9dafdfe730cf537fd0907ed3ef
 md5=c7d5cbcdaaf98f194c2a59b26436ce34
 sha256=73f3b92c0f85ab2bf0f9bb18f928a8b84cacdbb459f3a530df540d4ddf134405
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.16.tar.gz]
+md5=7bc5c89870d47c88f407fcfd666c739d
+sha256=102bb7a5d329dd6831bc8a923fa0b5d7634efa215e3d15377630d9b738df49da
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -4394,6 +4414,10 @@ sha256=e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2
 md5=d3b716a7e798faa1c6a867675f00306a
 sha256=8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3
 
+[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.78.tar.gz]
+md5=d4aa04b9df35b4bd663be38e959941c8
+sha256=ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21
+
 [http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.3.tar.gz]
 md5=eeec2c3ae0a857c75fd3ac96e0612921
 sha256=6ca8464a04d08232968d1ffca3d3f777f55dc39326040c487f50f52d4272e820
@@ -5310,6 +5334,10 @@ sha256=ad2c7ca228cdc79405c3853e7fdbfd5c239a6e9ad9a1a237e7e1b0c0b10f3ad4
 md5=89e6dc430ad198c8044f261645d8bc6c
 sha256=5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9
 
+[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.26/empathy-2.26.1.tar.bz2]
+md5=1edc492c0fd339dc30f0a443adad5fbe
+sha256=bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7
+
 [http://download.berlios.de/emul/emul-1.0.5.tar.gz]
 md5=f713b4d3c6a733b429de2673e4427483
 sha256=b91c7fb6420f6787d34b88b1e0d2e705e1006b5bce17235356f84a3c14329612
@@ -5798,6 +5826,10 @@ sha256=1e0aa136693a3e9f4b43ebd71e7bd934cea31817a4a6cba2edc7aac353b8a93f
 md5=2aaf871471a9ec037763c5dc7c193c57
 sha256=6b9785167934948a582839f9723e37214cab1607a9764c35f10d555f8e662575
 
+[http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.9.tar.gz]
+md5=f2d4fad95009bc7eae29f97c6f560dcd
+sha256=84553ff12c5245705806107448e85c96950b4b7a5eaf85461c89987be8ea644d
+
 [http://download.savannah.nongnu.org/releases/fastjar/fastjar-0.95.tar.gz]
 md5=92a70f9e56223b653bce0f58f90cf950
 sha256=ca03811490c965abc9f466e75418ae48bb71f14d8e8ed4c43e8109207b85ce54
@@ -6022,6 +6054,10 @@ sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d
 md5=c315e06cdfe9ee76aa4831ece1ed5df3
 sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
 
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2]
+md5=ff6bf463300cb56bcf750973b2af3d80
+sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
+
 [http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz]
 md5=78770f1abce09fbbaa0a46ce8ccc607f
 sha256=9d13db38c065d70f48ce70580c7d8cd940d923192c04bc3cb356cc98879b5788
@@ -8458,6 +8494,10 @@ sha256=8895c046511d06c47dcc8d8608cb220e0b608cede1ea169174ab3bc451d111c5
 md5=74ca3a6e37c9d9ae9fe2c50fc6d8350f
 sha256=63490b00244b0e6d7b54205e0d27ab22784ad0b328c7fa3e56aa0133677884fe
 
+[http://gpe.linuxtogo.org/download/source/gpe-announce-0.14.tar.gz]
+md5=4ec782fb49dd0e5549817d9e8601f9fc
+sha256=447c23943d4c004ceb25c7079058f79e270915cf6650e31c92498865dbed22a6
+
 [http://gpephone.linuxtogo.org/download/gpephone/gpe-applauncher-0.10/gpe-applauncher-0.10.tar.bz2]
 md5=466f9316024ed82ee1921b56376f04ce
 sha256=916ef522cbd2af8cc9623c2e4a34a8d1e45f9852bbb63a40ac056ba2c773eada
@@ -8602,6 +8642,10 @@ sha256=2d40ea6851c2b90261b88941dc7a8ee83c4a333e7a2acdd4eb0afbc87b5e5da1
 md5=75e087fcf8345cf1bfde7e172844e949
 sha256=0070e1c622f3f0cf9c40556f551de3e6059c7f8b3070516c0e4173dd09f57759
 
+[http://gpe.linuxtogo.org/download/source/gpe-clock-0.27.tar.gz]
+md5=93fcd53df14e2005edbadeb128d0a274
+sha256=c4c8a6d759e06ce9fd339ccd75479c8b62c9da434c4bb1246832419e5068e1df
+
 [http://gpe.linuxtogo.org/download/source/gpe-conf-0.2.3.tar.bz2]
 md5=beec965857c6fb5f55dd2a322cae7e37
 sha256=75bfe61f49bad95ff4220581c04af4fa3617cb639d98141d833e6aef68b77468
@@ -8842,6 +8886,10 @@ sha256=980320814b23cc51303436afb110397b15b950896f7f229484005f81d5cb6346
 md5=41b1ef201e4583e55a7462f1404de70d
 sha256=f8eb8f0c3af15acd5ad8c17fcc6d1ed2a43c35877d68a403eeb5bc1a1f0b3ccf
 
+[http://gpe.linuxtogo.org/download/source/gpe-mixer-0.50.tar.bz2]
+md5=67765a32def3ee408e84b9814b4e9759
+sha256=e7a13c0fd3eb0768034008778cb724aed8fbdf63d460d4df7212c3d2c14325b9
+
 [http://gpe.linuxtogo.org/download/source/gpe-nmf-0.17.tar.gz]
 md5=3fd22f7d95f9e1f328d768dedf7313a5
 sha256=6c11e7af568bf13602dec79cba5aacea590a2ec585f96dc96f87fa8950ffc31d
@@ -8966,6 +9014,18 @@ sha256=44278e12358531f588501b2d79bb3a32c69e3cddb243674a414df20e3990f196
 md5=b9abca6437f13c4fc5bbb244738de9ea
 sha256=07c91f5433d7c6c44c54640e9f5b65addedaf0eec5c5705175608404bee6de37
 
+[http://gpe.linuxtogo.org/download/source/gpe-su-0.11.tar.gz]
+md5=557d54b0d55fa5134436e8b4afb1e624
+sha256=2ab8f54d65d1555fe71307a685b1be9b2d0e04f862feb5e2487f54ef140dad2b
+
+[http://gpe.linuxtogo.org/download/source/gpe-su-0.14.tar.gz]
+md5=d7a0b0ac64f60a7cceb77b65d50176e1
+sha256=405a5137e9de5487e942d54cc5ee8edb66c54cec48925ff90368b36e38942536
+
+[http://gpe.linuxtogo.org/download/source/gpe-su-0.15.tar.gz]
+md5=3830c34b4482f892607c3b768e6dc7f3
+sha256=468a61461e0569dc55eca454a5e8676163b6544f0af41241e97479604f029791
+
 [http://gpe.linuxtogo.org/download/source/gpe-su-0.18.tar.gz]
 md5=7e22069a6c59138f8b6e3f9cbc6bb616
 sha256=bf1df54e88dbfa94be7b9f9a4c897635dca1ec56885352d8ebeac99f747b0554
@@ -13574,6 +13634,10 @@ sha256=9cd2317dac67fd2161565a21c7b3f9f43b6b6cd93441233226310478ffd4bf50
 md5=9233cb77876eb642374a0d2bcaba1170
 sha256=c2ae0a07d863536261b8a0562f3f77aa224fa1f413d85d824a765d00e37c5de4
 
+[http://nice.freedesktop.org/releases/libnice-0.0.6.tar.gz]
+md5=055e3eedf735ee1257fd4bb9ce86d04e
+sha256=adf3612367456328609c65ecc39c9bb08c0fef84cebbd1a3b5fcfe5e9614ac82
+
 [http://downloads.sourceforge.net/libnids/libnids-1.18.tar.gz]
 md5=9ee6dcdfac97bae6fe611aa27d2594a5
 sha256=b0275c914197a53c6ccf631eac756fd37ec6f2d8f09f15757061495cf9be0fcd
@@ -16142,6 +16206,10 @@ sha256=4a84422c270625162f6e9e1e4e8151d9546457d64c61c2b3c896cbf43fb54ce5
 md5=dccaddeb49d7def8a19cf497cb7eabf8
 sha256=cea3848006631801709588b8ae6808dbc768f62b6da4085073075f276309fd0d
 
+[http://goodies.xfce.org/releases/midori/midori-0.1.6.tar.bz2]
+md5=afed64074b2ed195aae171b2178650e1
+sha256=e6cc1b6da8a7af99ba9298e0cb4aac790595f04e04497ea8c2bb4b48c44feb5f
+
 [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2]
 md5=d50f0a9683dee60685bcd48e04970949
 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee
@@ -17738,6 +17806,10 @@ sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd
 md5=9613e6be14ba7a0ca5d42a88e6ed3516
 sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98
 
+[http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.13.1.tar.gz]
+md5=293f16da6dd434e68652f0f725b7f97c
+sha256=2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
+
 [http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.7.1.tar.gz]
 md5=e69ba3f5a2ac76e3b6117826d0c536b2
 sha256=2f2fc74a13df58f560c40385cd78683c66623d7a8271cb17941a9de7be07d43f
@@ -18310,10 +18382,18 @@ 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://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2]
 md5=cd69d16ea42bbf20d0a505690be45868
 sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2]
+md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
+sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -22334,6 +22414,10 @@ sha256=a7147079740acef2df0d2caab164062b12806d988216aa03667198d1100f5eb2
 md5=c28db354576aaec2152970b06d534640
 sha256=a7147079740acef2df0d2caab164062b12806d988216aa03667198d1100f5eb2
 
+[http://telepathy.freedesktop.org/releases/telepathy-farsight/telepathy-farsight-0.0.7.tar.gz]
+md5=882c9630ab28706d34d7d6d1060d43f0
+sha256=877760e794fb050448b6e591616afaba061d40c319e86b145053edf22df5570d
+
 [http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.3.0.tar.gz]
 md5=12a4508e338a39c63c24c41261eba3dd
 sha256=b4fcd32237271e400b00e779116e8203eac5efdaf53c78b9909b85a158fd81d8
@@ -22346,6 +22430,10 @@ sha256=3c4eb81c9d516937565a295beb0e98ab5c2a04864a0a5c8cef32916c63056b05
 md5=94bbf929aceac7601421e60ba35683a5
 sha256=63cd37752d153d222fa4a1fe08f6188832341f41652482bd7891e3fbe0ff8dd7
 
+[http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.27.tar.gz]
+md5=0bd4fdfb63d86d5e297ae069ad489704
+sha256=9a4ce52bd7eb9b8010a481be71117d814eb15fe9c8579817c7b486199a3801ac
+
 [http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.7.6.tar.gz]
 md5=17564dcb79d886d527609c154834c1c7
 sha256=9ce73e484b2f2858d46ffea9893f9823b5de9c7310f7c26b027f73a1c8fde857
@@ -22374,6 +22462,10 @@ sha256=c587eeab36208da798203cd5997fb82c891136dcd18780cd06e3d27a1d6d4a58
 md5=33e68c9876de84a252a84bf5f828aab6
 sha256=49dca0428d69f43c856800967b2def8c890cd322fbdd0aa47c227aec5820a690
 
+[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.29.tar.gz]
+md5=ae67d4fe42c7e337813754cb5927b6cc
+sha256=7bf25e050e8b8ceb983c1cad6b4e38892b052f6da82df3b7aec7b2ea50a8702e
+
 [http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz]
 md5=21bfda9e1fa12e25b4173deb9ffd0b5d
 sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82
@@ -22442,6 +22534,10 @@ sha256=02a5c752201e016905c75503217af5a25eebe3f6a4e02a75173ed34021401296
 md5=1cf9e0a1c6becbbeb5872e7a77e9fc77
 sha256=0eb6e2cccd3e4fa61264507fe984d10cd47ebb125a6f9d5f31cbb3040f57b36c
 
+[http://gpe.linuxtogo.org/download/source/teleport-0.33.tar.gz]
+md5=f406e66bf6a1effc31abf150ea7b5da1
+sha256=f5e73b32337c2616114e0e45cdbd053975ffd38ec3fb28a411e165dbf27a583a
+
 [http://gpe.linuxtogo.org/download/source/teleport-0.34.tar.gz]
 md5=ae571a20333f90d4b79b68c446387925
 sha256=266d6ec9795c2b480101c8754988df68da2c5b3579687bf51ae31000b08ba8bd
@@ -26722,6 +26818,10 @@ sha256=723dbbdfac6e421aa3343a2f1cef7cfb998bb5c045dcf0df870aeba6dd78b79d
 md5=658badd22689cdde536050f740ec8319
 sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62
 
+[http://gpe.linuxtogo.org/download/source/xserver-common-1.24.tar.gz]
+md5=6d7aaa9c267427ddb78faf008cf78187
+sha256=8109646b77c08a0f269531ad42475782101a88681c2590453f4a5c9fe4681932
+
 [http://gpe.linuxtogo.org/download/source/xserver-common-1.3.tar.gz]
 md5=b55e9347b9aed725cc7baf91701cdd83
 sha256=177b5a3e65d7a64b5a0fbbf1b10f8e3d020a20c823b1bb9f3269dc835df213e1
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index a466834968..bb50220f29 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -17,8 +17,8 @@
 
 #DISTRO_VERSION = "2009.X"
 DISTRO_VERSION = "2009.X-test-${DATE}"
-DISTRO_REVISION = "1"
-DISTRO_PR = ".1"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".2"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -46,7 +46,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}
 
 
 # set feed path variables
-FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
 
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
@@ -99,9 +99,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 # Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-ANGSTROM_GCC_VERSION_486sx      = "4.3.3"
-ANGSTROM_GCC_VERSION_armv7a     = "4.3.3" 
-
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
 
@@ -109,10 +106,10 @@ ANGSTROM_GCC_VERSION_armv7a     = "4.3.3"
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION                     ?= "4.2.4"
+ANGSTROM_GCC_VERSION                     ?= "4.3.3"
 
-#2.19.51.0.3
-ANGSTROM_BINUTILS_VERSION                ?= "2.18.50.0.7"
+ANGSTROM_BINUTILS_VERSION                ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv7a         ?= "2.18.50.0.7"
 
 PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
 PREFERRED_VERSION_binutils-cross         ?= "${ANGSTROM_BINUTILS_VERSION}"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d8c3cd78df..7e921bf06a 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -32,9 +32,6 @@ require conf/distro/include/angstrom-${LIBC}.inc
 
 # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
 ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb"
 
 
 ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
diff --git a/conf/distro/include/eglibc.inc b/conf/distro/include/eglibc.inc
index ed3e0ecf9d..0d2087ed4b 100644
--- a/conf/distro/include/eglibc.inc
+++ b/conf/distro/include/eglibc.inc
@@ -1,5 +1,5 @@
 # Add glibc overrides to the overrides for eglibc.
-OVERRIDES .= ":glibc"
+OVERRIDES .= ":libc-glibc"
 
 # The things eglibc can provide.  We default to wanting eglibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
diff --git a/conf/distro/include/glibc.inc b/conf/distro/include/glibc.inc
index 1d6b22d8b5..f9140ffa43 100644
--- a/conf/distro/include/glibc.inc
+++ b/conf/distro/include/glibc.inc
@@ -1,5 +1,5 @@
 # Add glibc to the overrides.
-OVERRIDES .= ":glibc"
+OVERRIDES .= ":libc-glibc"
 
 # The things glibc can provide.  We default to wanting glibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 8be99a363d..1be3dabc2b 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -39,6 +39,7 @@ SRCDATE_python-cairo ?= "20060814"
 SRCDATE_qemu-native ?= "20070613"
 SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
+SRCDATE_rosetta ?= "20090514"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
 SRCDATE_waimea ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3b24ce62c7..bd78008dd0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -249,11 +249,11 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "42127"
+SRCREV_pn-webkit-gtk ?= "43434"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
-SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77"
+SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
diff --git a/conf/distro/include/uclibc.inc b/conf/distro/include/uclibc.inc
index 979b7f1539..ee18fc87e1 100644
--- a/conf/distro/include/uclibc.inc
+++ b/conf/distro/include/uclibc.inc
@@ -1,5 +1,5 @@
 # Add uclibc overrides to the overrides.
-OVERRIDES .= ":uclibc"
+OVERRIDES .= ":libc-uclibc"
 
 # The things uclibc can provide.  We default to wanting uclibc to provide them.
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 022d65d4c2..a00fec4c2a 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -102,7 +102,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 # generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge
 # time-savior for developmental builds. Format: list of locale.encoding pairs
 # with spaces as separators.
-# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8"
+# GLIBC_GENERATE_LOCALES = "en_US.UTF-8 en_GB.UTF-8 de_DE.UTF-8"
 
 # Uncomment this to select a particular major kernel version if the MACHINE setting
 # supports more than one major kernel version. Currently this is suported by the
@@ -147,6 +147,12 @@ IMAGE_FSTYPES = "jffs2 tar"
 # in the process of marking these so let us know if you find any.
 # PARALLEL_MAKE = "-j 4"
 
+# Uncomment to run multiple bitbake threads in parallel.
+# Bitbake can do multiple jobs in parallel: Its a good idea make use of 
+# all available resources: e.g. to download sources while some other
+# piece of software is compiled.
+# BB_NUMBER_THREADS = "2"
+
 # Uncomment this if you want BitBake to emit the log if a build fails.
 BBINCLUDELOGS = "yes"
 
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 5d6d9ffbff..9f48f750e7 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 = "r31" 
+MACHINE_KERNEL_PR = "r33" 
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index 34e803e418..4fa9f75eb3 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,7 +1,6 @@
 include conf/machine/include/tune-xscale.inc
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
-KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \
                    --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
index 5c8da70e68..f46d4f5822 100644
--- a/conf/machine/micro2440.conf
+++ b/conf/machine/micro2440.conf
@@ -5,8 +5,15 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.29"
 
-# used by sysvinit_2
+# This is not necessarily true, there is a 800x480 display as well
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "110"
+
+# used by sysvinit
 SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
@@ -16,4 +23,8 @@ MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa eth
 require conf/machine/include/tune-arm920t.inc
 
 KERNEL_IMAGETYPE = "uImage"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n \
+        ; sumtool -e16KiB --no-cleanmarkers \
+        --littleendian --pad \
+        -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+        -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index a74746824d..a74746824d 100755..100644
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index c31828aafe..94ca2946e6 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -7,7 +7,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
@@ -15,7 +15,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
+XSERVER = "xserver-xorg \
+           xf86-input-tslib \
+           xf86-video-glamo \
+           xf86-input-keyboard"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/topas910.conf b/conf/machine/topas910.conf
index 3b29929eaa..c36dc3bc83 100644
--- a/conf/machine/topas910.conf
+++ b/conf/machine/topas910.conf
@@ -26,16 +26,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
-ROOT_FLASH_SIZE = "256"
+ROOT_FLASH_SIZE = "16"
 
 # extra jffs2 tweaks
 IMAGE_FSTYPES ?= "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--little-endian --pad=0x1DC0000 --eraseblock=0x20000 -n"
-#EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \
-#  --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
-#  --littleendian --pad \
-#  -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-#  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \
+	--pad 0x1aa0000 ; sumtool --eraseblock=0x20000 \
+	--littleendian --pad 0x1aa0000 \
+	-i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "lowlevel-topas910"