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

14 files changed, 171 insertions, 39 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 9fd26b32ee..b12faee8e7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -538,6 +538,10 @@ sha256=5ed480cb76c91c2739ddba87f15437510e58c60dfdd7ead6f469149b2da94bb7
 md5=fc5e35645b75befae28c88b711b28ffb
 sha256=42d06febf4717dd43eb557027d1b00a484c22589793438778ed69449a073a3b8
 
+[http://kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.1.0.tar.bz2]
+md5=9cda791c827dfcd9f2888caf0a64cc4a
+sha256=139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
+
 [http://ltt.polymtl.ca/packages/LinuxTraceToolkitViewer-0.8.41-12052006.tar.gz]
 md5=de139052f234cf54d714c960524bd5ef
 sha256=a21431358d7f2a5deb76b1a95ee80dc870b0dc2426d4860c61144343d48eff3e
@@ -1318,6 +1322,10 @@ sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
 md5=84d9e0001fe01c14867256c3fe115899
 sha256=55386de7bf78f67ad2b9ef664a578db66ee53f512a28eb067cd2303f5e23d740
 
+[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.36.tar.gz]
+md5=1b868962b658bd87e1563ecd56498ded
+sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
+
 [http://www.cpan.org/modules/by-module/XML/XML-Simple-2.18.tar.gz]
 md5=593aa8001e5c301cdcdb4bb3b63abc33
 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
@@ -1418,6 +1426,10 @@ sha256=b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
 md5=f61c623cdb3c3b2aed05bbc868050ddd
 sha256=b0d0f723a08372ac0889e44a590ee1f13f8c5487b394181396f978191a627bdd
 
+[http://www.abisource.com/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz]
+md5=284fe25289c160c3797b527a8aacad12
+sha256=f51b614b1202cf63a5f7ede093d31d638ece3c8e76da4036cc4aed589a9cd2ec
+
 [http://www.abiword.org/downloads/abiword/2.5.1/source/abiword-plugins-2.5.1.tar.gz]
 md5=b1ce7ca49a0ee4e04f828e10eaebe6a9
 sha256=37faf6ea346c9b6473c5b2dfd1bb599457faa06b6a7cdef58e3e9f3e2773976b
@@ -2378,6 +2390,10 @@ sha256=dedf5325105f071e5d9f898fdb7337a7fe88a3a8a1f832a6056ba00477b8cc3d
 md5=068c1d220b07037e64caf87d4a7a0504
 sha256=260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950
 
+[http://avahi.org/download/avahi-0.6.25.tar.gz]
+md5=a83155a6e29e3988f07e5eea3287b21e
+sha256=9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59
+
 [http://www.apache.org/dist/excalibur/avalon-framework/source/avalon-framework-api-4.3-src.tar.gz]
 md5=d4cffb4ba1d07bdc517ac6e322636495
 sha256=a4d56a053609ddfc77f6a42c3f15a11708d5e0eb29ffc60a40b87e4cc7331d47
@@ -2646,6 +2662,10 @@ sha256=6714d9c1285fc04d39f03b85ebad3723be6f8709ca8935e984b280ac42e97492
 md5=d44b5dddebd8a7a7309aea6c36fda117
 sha256=4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33
 
+[http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/OMAP35x_AM35x_Video_Texture_Streaming/1_0/exports/bc-cat-0.1.0.tar.gz]
+md5=c7fdd6041ca823ebe95d1a6b1da12ba7
+sha256=daa948e966ba3aec698e45987e85fa6e1c3b3f54b55f117573c9e0f206d02c92
+
 [http://archive.apache.org/dist/jakarta/bcel/source/bcel-5.2-src.tar.gz]
 md5=905b7e718e30e7ca726530ecf106e532
 sha256=68039d59a38379d7b65ea3fc72276c43ba234776460e14361af35771bcaab295
@@ -3302,6 +3322,10 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 md5=328bfec66c312150e4c2a78dcecb504b
 sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 
+[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz]
+md5=1a0926fe4c8228f14a2622b4182b801e
+sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0
+
 [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
 md5=e006cde4b4a28cfce95e43710cd126a9
 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
@@ -4358,6 +4382,10 @@ sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
 md5=f5b84040e99eeff3a18e11e83b1eb12a
 sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.46.tar.gz]
+md5=9bcdc528f38bc17ecb92519a28b741f1
+sha256=1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.8.tar.gz]
 md5=3f1995bf91846b601a25a37832c88cb6
 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
@@ -5826,6 +5854,10 @@ sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee
 md5=b96a6d4263122f1711db12701d79f738
 sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
 
+[http://sources.openembedded.org/eject-2.1.5.tar.gz]
+md5=b96a6d4263122f1711db12701d79f738
+sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
+
 [http://ekg.chmurka.net/ekg-1.6.tar.gz]
 md5=1094eee5062d9b9900c4b28bd68fb564
 sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
@@ -6718,6 +6750,10 @@ sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
 md5=136867f95c86f3988b7f825e874b85de
 sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
 
+[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2]
+md5=0b6ccb1e50d96b7127a18a69399fcf05
+sha256=b2b0a231aae105090948521a469c5019eb886f0562fa3315a49cebaf74f61be4
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/3.5b4-candidates/build1/source/firefox-3.5b4-source.tar.bz2]
 md5=ff6bf463300cb56bcf750973b2af3d80
 sha256=b653f2fa8dfdd0a54a6b8c576769719cf9014ca6b09f8e9d351721a51766d95d
@@ -7454,6 +7490,10 @@ sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3
 md5=585a65f61c2cd308ab45d5c514f695dc
 sha256=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3
 
+[http://ftp.gnu.org/gnu/freefont/freefont-ttf-20090104.tar.gz]
+md5=1128bb17763cde6990eacd5996f7def7
+sha256=2b8e7164b0c362d5c5e90275b25772514d76d5fda3d54c026445611e467d638e
+
 [http://dfn.dl.sourceforge.net/sourceforge/freeglut/freeglut-2.4.0.tar.gz]
 md5=6d16873bd876fbf4980a927cfbc496a1
 sha256=269f2d50ba30b381622eb36f20b552ad43a1b43d544b9075e484e7146e81b052
@@ -18862,6 +18902,18 @@ sha256=7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd
 md5=37b4479951fa0cf052269d27c41ca200
 sha256=6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9
 
+[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2]
+md5=1c03d3f4ccedcd9de1c0ac2226e0031c
+sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da
+
+[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2]
+md5=de15246c1f59665f3960015c49138da3
+sha256=73dff22a4622f2140b49ee824f1f69d6120135d828bc38f6877a619986c99245
+
+[ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2]
+md5=7d629aa8c0f1c8cdc11310b09a929626
+sha256=39494a9c05c47b9a28c6168211a5987a8386929a3210e637ed6191e3554ee9f6
+
 [http://www.mythtv.org/mc/mythtv-0.18.1.tar.bz2]
 md5=e6cabf88feeaf6ae8f830d3fdf7b113d
 sha256=86c9cf038d5d8a3fdf137ff735b55820281543a4a08e86cfad81a113a7b9a1d2
@@ -18878,6 +18930,10 @@ sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4
 md5=049e93d78d5370351539c9a23b47e1af
 sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7
 
+[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2]
+md5=1e4be634b137e5b944c94b418d8c3791
+sha256=5cba470ccd60fec00be2bf7ef231f104dcea8275698fe70f5df398dbe2fe19fd
+
 [http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz]
 md5=8746890ea666ac1b7ae6db77993c6592
 sha256=1a239a7bb0644441ca781459fbf5a1c5fb95e823351bf308aa680eb60cc45b94
@@ -19446,6 +19502,10 @@ sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66
 md5=f9adc013e0e4b26c992cc0ca05328f3d
 sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.18.tar.gz]
+md5=5674f746b55439d32bc765d2c5baad16
+sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -19870,6 +19930,10 @@ sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c
 md5=ba2ee667a8b7606b125b7d32f47ca578
 sha256=d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33
 
+[http://openvpn.net/release/openvpn-2.1_rc20.tar.gz]
+md5=8187f8f21507faac5e320e32747203b8
+sha256=4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267
+
 [http://downloads.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2]
 md5=7f35543286911b827dcbf8d07a7d72be
 sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a
@@ -23874,6 +23938,10 @@ sha256=c7d7f2fb4a3903dd26a90df358f5757f2637c333cd6f6bf511f506a958349fa1
 md5=9b48fc595d7291fa8edddfafba2cb7a9
 sha256=28a6af2d1490374de26084e346bbd227586c0f6232dcf4cfebf80413adc7d932
 
+[http://download.berlios.de/slim/slim-1.3.1.tar.gz]
+md5=727d0acb24c0fbf0751134c37a9c895f
+sha256=acd7a4024bfd7c2a4f3cd5d77ffed4956d13727a8f554042126d0568defe0f77
+
 [http://downloads.sourceforge.net/slotsig/slotsig-0.6.tar.bz2]
 md5=dfe9f5d3f17075ec23eb923899ac5f24
 sha256=124499d3c5d2d44ab07b60c235547079044f3728fd3c907987900e270bd947f8
@@ -25406,6 +25474,10 @@ sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
 md5=768059a486ff73ae18595afab3b78a70
 sha256=f4d3b413a61bfe6895f7f87bbfbcc7159f66b1d73fc29a7380839802fbb01198
 
+[http://ftp.gnome.org/pub/GNOME/sources/tracker/0.6/tracker-0.6.95.tar.bz2]
+md5=a4edc8aa830070bd3f1d80a7df07c80c
+sha256=0fe42353117c62ccc9de3b3c9c11acf707a0702d30cd24b8d1cd1e2581dec339
+
 [http://downloads.sourceforge.net/transconnect/transconnect-1.2.tar.gz]
 md5=c255ff48387ea6a7092707ba992237e7
 sha256=47d6cc44f78fc6d4cdb1dfee02fe6e0f4d8aae0ce2e3e92567667f0475736617
@@ -26038,6 +26110,10 @@ sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4
 md5=6e393cc7423b5d228fa3d34c21481ae4
 sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f
 
+[http://downloads.sourceforge.net/linux-usb/usbutils-0.86.tar.gz]
+md5=34979f675d2bcb3e1b45012fa830a53f
+sha256=b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4
+
 [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz]
 md5=2ac1bdae03a858b965e895b211a75ad7
 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd
@@ -26650,6 +26726,14 @@ sha256=4f923e24d674ac62ded3da402a4de6d402886d80e3d7cac91cf026921f32fcf7
 md5=b69ee5a5ffc825ff6d7970a62dcae46a
 sha256=6641a438972acdc8113957c25a17db55d6d9c3ce037ed3ac5337ac6ee153d73f
 
+[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08-rev2.zip]
+md5=2283368c079076b3e2d53cff854ca047
+sha256=505a77bda0011a1968a5a5c764cdbe81c536b1c8863f4dd31545735f5056497e
+
+[http://djwillis.openpandora.org/pandora/wifi/wl1251-wireless-2009-10-08.zip]
+md5=850aabefe44682167cad5e57b6145ac3
+sha256=0e8cb79d14e2e3c82f311c052ea2e22cc380f9a97af1d259d25e2605e3237885
+
 [ftp://ftp.elmeg.de/artem/ClientCards/11b/linux/wl_lkm_718_release.tar.gz]
 md5=049c6c3d410e9f46884627b57485d3e7
 sha256=a28c7ea94d57a5354b7de06cf5f6416d80a40596911c129d4b6a4087dc916831
@@ -27054,6 +27138,10 @@ sha256=7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f
 md5=66d60febc62a01bafac9bb3a35fb37ae
 sha256=f95a9a9e477128aae536669dedd79f4e7b4d469072565695289e4bbb5b36dd63
 
+[http://www.xchat.org/files/source/2.8/xchat-2.8.6.tar.bz2]
+md5=1f2670865d43a23a9abc596dde999aca
+sha256=8c89dbf36304b99363a7f090d695447653102b4528ca2aa367a2abe5cff1746d
+
 [http://xorg.freedesktop.org/releases/individual/app/xclipboard-1.0.1.tar.bz2]
 md5=2c6ecedb10dc51adbb64c95f22fd99c2
 sha256=3399a27101285112ea578e1855c8374254afa8d427a3c5943458abc27c4d70fc
@@ -27534,6 +27622,10 @@ sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994
 md5=e926692d74ee81ed459d0fe89439ff8b
 sha256=433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.6.tar.bz2]
+md5=bc4b2356e1dbf2d21e1e95249b18f5f8
+sha256=dbf3799e207175e91f50492d51343e5cfdc706f637f6e9f14257b764e86bb3f9
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.0.tar.bz2]
 md5=21dac6461379d67ee3b333c77f63e7bf
 sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8
@@ -28938,6 +29030,10 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=73a366b9892152266b465d7d9c35bef4
 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.2.tar.bz2]
+md5=88352816c84cbea57121b0c478976976
+sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
@@ -30146,6 +30242,10 @@ sha256=a3cfc867672924f27d5ed39a99bc089cc9417d193513984f0a081a92230e947b
 md5=9bcab80b474d5454477d1ca166a68c34
 sha256=27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1
 
+[https://launchpad.net/ubuntu/karmic/+source/xubuntu-artwork/0.38/+files/xubuntu-artwork_0.38.tar.gz]
+md5=38626b5ae9abfe00428a5f0a265d5177
+sha256=8a73aea3fcb2b33968bc12f28befbf7a83c5d45fe1898e54855f095538238b8d
+
 [http://downloads.sourceforge.net/xvidcap/xvidcap-1.1.6.tar.gz]
 md5=c6add7ae452e5cecbdda6e55e7c67cdb
 sha256=17ca7b7f8ce12f7e312b2abc2da7f381dc0e964cdac6312631cd7987f02b9fba
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2f22a7d91d..b57ea4d673 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -22,6 +22,7 @@ SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-bubble-keyboard ?= "194"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
+SRCREV_pn-cdparanoia ?= "16684"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
@@ -41,9 +42,6 @@ SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-essential-dialer ?= "194"
-SRCREV_pn-exalt ?= "79"
-SRCREV_pn-exalt-daemon ?= "78"
-SRCREV_pn-exalt-module ?= "78"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
 SRCREV_pn-ezx-gen-blob ?= "2426"
 SRCREV_pn-ezxd ?= "2074"
@@ -80,8 +78,6 @@ SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libefso ?= "194"
-SRCREV_pn-libexalt ?= "78"
-SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6"
@@ -113,6 +109,7 @@ SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
 SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
 SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
+SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
 SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
@@ -187,9 +184,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "219"
-SRCREV_pn-opkg-native ?= "219"
-SRCREV_pn-opkg-sdk ?= "219"
+SRCREV_pn-opkg ?= "240"
+SRCREV_pn-opkg-native ?= "240"
+SRCREV_pn-opkg-sdk ?= "240"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
@@ -232,6 +229,7 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
+SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "5394"
@@ -242,7 +240,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 ?= "43038"
+EFL_SRCREV ?= "43437"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
@@ -313,4 +311,8 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
 
+#exalt
+SRCREV_pn-exalt ?= "${EFL_SRCREV}"
+SRCREV_pn-exalt-client ?= "${EFL_SRCREV}"
+
 require conf/distro/include/sane-srcrevs-fso.inc
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index f7a60b4be4..0ee57c407f 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -18,7 +18,6 @@ require conf/machine/include/omap3.inc
 PACKAGE_EXTRA_ARCHS += "omap3517-evm"
 
 # Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 69cdec6f1f..a5de68e0af 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -41,6 +41,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 PREFERRED_VERSION_u-boot = "git"
 
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf
index deb17233cc..55c18507c3 100644
--- a/conf/machine/igep0020.conf
+++ b/conf/machine/igep0020.conf
@@ -41,5 +41,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
 # UBI: sub-page size:              512
 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
-# MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 20f53bf643..f91607cf76 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r11"
+MACHINE_KERNEL_PR = "r12"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index bb750aad98..e87b56c282 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -11,8 +11,6 @@ UBOOT_LOADADDRESS = "0x80008000"
 # Only build u-boot, xload is optional
 EXTRA_IMAGEDEPENDS += "u-boot"
 
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
-
 # TI DVSDK stuff:
 CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
 CODEC             ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
index 2a583fe6e4..fe57c9ccc0 100644
--- a/conf/machine/include/tune-strongarm.inc
+++ b/conf/machine/include/tune-strongarm.inc
@@ -2,8 +2,7 @@
 # gcc does not differentiate between the different Strongarm versions, so neither do we
 # http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html
 
-ARM_ABI = "oabi"
 TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm"
-FEED_ARCH = "arm-oabi"
-PACKAGE_BASE_ARCH = "armv4" 
-PACKAGE_EXTRA_ARCHS += "armv4 "
+FEED_ARCH = "armv4"
+BASE_PACKAGE_ARCH = "armv4" 
+PACKAGE_EXTRA_ARCHS += "armv4"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index b06cb319ca..c896fa0b02 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -1,33 +1,74 @@
 #@TYPE: Machine
 #@NAME: OMAP3 based Pandora Handheld Console
 #@DESCRIPTION: Machine configuration for the Pandora http://www.openpandora.org/ Handheld Console
+#@MAINTAINER: John Willis
 
 TARGET_ARCH = "arm"
-require conf/machine/include/omap3.inc
+
 
 PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-tslib \
-           xf86-video-omapfb \
-          "
 
-#What is the correct one, both seem in use?
-MACHINE_GUI_CLASS = "bigscreen"
-GUI_MACHINE_CLASS = "bigscreen"
+XSERVER = " \
+	xserver-xorg \
+	xserver-xorg-extension-glx \
+	xserver-xorg-extension-dri \
+	xf86-input-evtouch \	
+	xf86-input-evdev \
+	xf86-input-mouse \
+	xf86-input-keyboard \
+	xf86-video-omapfb \
+"
 
 #800 * 480 Widescreen
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "800"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
-# Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
-
-IMAGE_FSTYPES += "jffs2 tar.bz2"
-EXTRA_IMAGECMD_jffs2 = "-lnp "
+#IMAGE_FSTYPES += "tar.bz2 ubi"
+IMAGE_FSTYPES = "tar.bz2"
+#EXTRA_IMAGECMD_jffs2 = "-lnp "
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen bluetooth wifi"
+require conf/machine/include/omap3.inc
+
+# Put it below omap3.inc as we override the kernel here
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+# Use our 'Powered by Angstrom' splash for the images.
+PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 1996 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ARCH = "arm"
+UBOOT_MACHINE = "omap3_pandora_config"
+
+PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
+PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "x-load"
+
+PREFERRED_VERSION_libgles-omap3 = "3.00.00.09"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 3595383f03..2839b7ddf6 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -45,6 +45,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 
 PREFERRED_VERSION_u-boot = "git"
 
-MACHINE_EXTRA_RRECOMMENDS = " rt3070 omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index ad410fae4c..097904d886 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -16,7 +16,6 @@ GUI_MACHINE_CLASS = "smallscreen"
 require conf/machine/include/omap3.inc
 
 # Ship all kernel modules
-MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules"
 
 IMAGE_FSTYPES ?= "jffs2 tar.bz2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf
index 4ca164e633..4732f68c98 100644
--- a/conf/machine/omapzoom.conf
+++ b/conf/machine/omapzoom.conf
@@ -52,6 +52,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 PREFERRED_VERSION_u-boot = "git"
 #EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
-#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 # and sdio
 MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf
index 7d0a72b5d7..749339faea 100644
--- a/conf/machine/omapzoom2.conf
+++ b/conf/machine/omapzoom2.conf
@@ -50,7 +50,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
 PREFERRED_VERSION_u-boot = "git"
 #EXTRA_IMAGEDEPENDS += "u-boot x-load"
 
-#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules "
 MACHINE_EXTRA_RRECOMMENDS = ""
 # and sdio
 MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf
index c7baaedd2d..dccc892472 100644
--- a/conf/machine/palmpre.conf
+++ b/conf/machine/palmpre.conf
@@ -26,6 +26,5 @@ 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"