merge of '4751c499f21f8617037586caaf287ddbb137be0b'

     and 'ada400c152f3d86308fbd602f1ddf750e4f21570'

3 files changed, 71 insertions, 70 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index cc430b3ac3..d0d1e686cc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -219,8 +219,8 @@ md5=b5174b59e4a050fb462af5dbf28ebba3
 sha256=45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
 
 [ftp://ftp.debian.org/debian/pool/main/f/fakechroot/fakechroot_2.5.orig.tar.gz]
-md5=e2d4dd31f06c116685d0bdbccef84d00
-sha256=8961b4d552493bf0a00cbee21010fdf5344ebd7f29f304349c8c5023218c0227
+md5=b885951b98f4316f9686699e9853513d
+sha256=990cd830ea362ba2cb88ca7b59cd3f4d115a054621450b5cf211cadebed23ee0
 
 [ftp://ftp.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.2.5.orig.tar.gz]
 md5=9956b30139edaa4f5f77c4d0dbd80225
@@ -1286,10 +1286,6 @@ sha256=025655971eef7f76ece9754346d6eb4e2dd44ddf569c4c84de27836aa24b04a3
 md5=9519eccf0638c9962f73a7b20da77e0e
 sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
 
-[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.1.tar.gz]
-md5=8b2f59b22f1cfbcd86234867e432cae3
-sha256=73975dca4c345f1e41558ef8704532a1525d96a9b149d6f6729eb24c372bb577
-
 [ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
 md5=1f0193358e92559ec0f598b09ccbc0ec
 sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
@@ -1695,8 +1691,8 @@ md5=1884607cdebaf730737cb99b2909219b
 sha256=639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c
 
 [http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-0.4.tar.gz]
-md5=bc5d1f77f9548a1c8c22e5ec1692e799
-sha256=042ed2bb4b15bbc1f1457447cd3ce0c14b339671ebfd3f68b4174e0aa039c043
+md5=797852a19505f7d919db96dd994d0484
+sha256=2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff
 
 [http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-0.7.0.tar.gz]
 md5=dccb921b5df6a15312b56630ac4ac205
@@ -3363,8 +3359,8 @@ md5=c572e7842fe36348f5b2972c1025a75a
 sha256=138d2e59569f76f1a5d35bd5d85e7006eeebc4f48cd3dac902e2824ed50c3d80
 
 [http://downloads.sourceforge.net/shfs/shfs-0.35.tar.gz]
-md5=f250003d998daea29af6bf81b5e7a1b4
-sha256=34cfa1df400b07d553488a3ab24bc445127b44fb2e8e6f4868f34ce9b3a7c3b8
+md5=016f49d71bc32eee2b5d11fc1600cfbe
+sha256=0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
 
 [http://downloads.sourceforge.net/slotsig/slotsig-0.6.tar.bz2]
 md5=dfe9f5d3f17075ec23eb923899ac5f24
@@ -3874,10 +3870,6 @@ sha256=13f59a7cd5190983412689495c399444cf73c1ced0813149e4480c8848bb9f17
 md5=40a93def0f37f1577c5edc638fcb35a5
 sha256=6e932e73818697ea9ec8909bed535a87ba34651031bbbedb63a42e4cdc423284
 
-[http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-0.6.tar.gz]
-md5=0d6b6d4fa861f73e0b4225e93077578f
-sha256=64c05a48e91850627cfaa7314d4b4b847547bc4333fa9345994fa49c79276f3d
-
 [http://freedesktop.org/Software/startup-notification/releases/startup-notification-0.5.tar.gz]
 md5=c7a96f4615b07ed847061b0a9a0be989
 sha256=7d2f388f7b50fc5c929ef173c2df900c588329ab07c16184dee3745a26ac54ae
@@ -6162,18 +6154,6 @@ sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58
 md5=34b0f354819217e6a345f48ebbd8f13e
 sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
 
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
-md5=2e230d005c002fb3d38a3ca07c0200d0
-sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2]
-md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
-sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.1.tar.bz2]
-md5=518d57e08fdacd88907166a3bfe383b7
-sha256=35bcba56edf2a24f5d38bac0e530b2ce0e06eb094ba083b4a679c903077a671c
-
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -6354,10 +6334,6 @@ sha256=deb6530d40ecad2b849d68912500e6d03bab4ac63de7a97340d05af1d7cf0ad4
 md5=5d139b1fb16f0e93f0c84290ad2aaff8
 sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90
 
-[http://libtomcrypt.org/files/crypt-0.97b.tar.bz2]
-md5=ae5f51ac4dd94404a51d3b4601cab6d1
-sha256=68959ec2463ff0936db670370f50818bfdfc5bd3399f8547d04e6ac688529147
-
 [http://links.twibright.com/download/links-2.1pre26.tar.bz2]
 md5=841af2540c789e254b8465e07e24c684
 sha256=c89f10d42be2a0be8a017e1084897b1aabc5bca76817e9dab43b758dff051c56
@@ -6418,10 +6394,6 @@ sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db
 md5=866ba97420f5ce978b6a6b1cb4338890
 sha256=17b82323151925ff5a7ad09a21781a0fa50ead4b87a339cee262271e4ededa13
 
-[http://llvm.org/releases/2.1/llvm-2.1.tar.gz]
-md5=b930e7213b37acc934d0d163cf13af18
-sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c
-
 [http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-0.9.3.tar.gz]
 md5=9f54fc8a40e26edd61ce67902b315a66
 sha256=07675051b60343820b235a818f2c2d528b86d2a19c2f56833213e3f574f9cd1a
@@ -6754,10 +6726,6 @@ sha256=741577b91c091fc9d6732b57732bdafb85739c65cd65194e506e1d01425bda56
 md5=d227a37a8a7b036eed44e4278db45735
 sha256=fcee22d7e31a936cde4672ac318ffabb9d39b7fc3b74de391bdade1419c59dfd
 
-[http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-1.0.49.tar.gz]
-md5=fbe492dbf3d68abb1d86c2322e7ed44a
-sha256=20acb0aa347f1629c4d5529ab8afbe4986fe820555049af3f905653300e5ea74
-
 [http://people.openezx.org/ao2/fbgrab_network_mode.diff]
 md5=71bf1218c52a6e4a1f38406748285255
 sha256=e8cf4fe15d7e99e86016db3ddc1f403c35c49f40c4d37209d76cd5785c541aa8
@@ -6766,10 +6734,6 @@ sha256=e8cf4fe15d7e99e86016db3ddc1f403c35c49f40c4d37209d76cd5785c541aa8
 md5=002e9d7d85a2f0e6261b6bf501c53a3e
 sha256=f399428e0e191233b4dcead88afbe78a26cc16bd9a47e305f6dd3299e011ef18
 
-[http://people.redhat.com/dcantrel/dhcdbd/dhcdbd-2.0.tar.bz2]
-md5=c3ae0208e6815491612bbd8586482ffe
-sha256=514bec6c457d3d503b5c0ba2e84db2c4da44857b5092bd00f2ff9a8e62351e88
-
 [http://people.redhat.com/jvdias/dhcdbd/dhcdbd-1.14.tar.gz]
 md5=1180dee7a51a4384d55768650634cf93
 sha256=e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505
@@ -7258,10 +7222,6 @@ sha256=f62081c6f8a70a35fb0b5b210329f6bba7f5e506e9b809e23ceba21a2c35278e
 md5=4dbdbe9a85c8f7f98dd0ee015a3c7b4f
 sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
 
-[http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz]
-md5=7b407c7ff5a38216f85d648365d81894
-sha256=bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb
-
 [http://rohanpm.net/files/inotify-tools-2.1.tar.gz]
 md5=8053f441fc3fe0f0c73cf483399da17b
 sha256=84a111a6a979152cd25b60825b4945da4b167f19fb9ec115f9c59b4b49927547
@@ -8698,10 +8658,6 @@ sha256=f9271db0ab5bd4cdc2e09d6185320c2041f62b1e64ba7fb78cab28d104ec7d79
 md5=a13e49376594c51fbfa74067f8d14d45
 sha256=e3ed263ee98971674f3f3cf55e42b7f2e79755b0f931f8a105676108185e8010
 
-[http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz]
-md5=854fd2826d96367999e5c252e16afbf5
-sha256=b82fbb74475244f2631247feaa77be49da3b8fd8ecc5cc9e9103f1d3227e01bf
-
 [http://www.kismetwireless.net/code/kismet-2005-04-R1.tar.gz]
 md5=19b4f192eb11a418ed3f6bf65c1226af
 sha256=921fcd3033ecfd97d33cad2d940c0a5e5bbf8cb36fd7a62646fd486993a5a96f
@@ -9030,10 +8986,6 @@ sha256=c1c5b5ab3431896502c9275daeb47610fb2a840faa6d580e140909a3f4ef7391
 md5=eca63798136caeeaf7fd4b24c3e10783
 sha256=88b11a3e89db847e1db51e6f2b0c69e2afa0035fb4a47f523d264765eedb2958
 
-[http://www.panix.com/~gesslein/am.tgz]
-md5=f7e4a6e3a214a82b035d0f69ae4bbc13
-sha256=988cce287562f67466ab512b7beef26e793d90c2a0793321c9f404e20d7a4423
-
 [http://www.pdaxrom.org/download/1.1.0beta4/src/mb-applet-tasks-1.0.0.tar.bz2]
 md5=3442d374f459c607395fd56998a6d7b0
 sha256=ae72570a433f4e928c4b424dde003c5035fee765fad23c8df76f4062d67c53a0
@@ -9074,10 +9026,6 @@ sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f
 md5=c389d3ffba0e69a179de2ec650f1fdcc
 sha256=6f0145ab1802092308adeb8dfa285f58e104f0822fa266e5ec97e9d27f0e1923
 
-[http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz]
-md5=016e68eb361d542f8bfc2ef1a7bd6c95
-sha256=31909921a3c00d0ab13e0137541531415648c7bd51802f5ca9a3b11a0d1bd9f0
-
 [http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.1.tar.bz2]
 md5=b5789bb7eeaed0809c5c82d0efda571d
 sha256=4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
@@ -11926,14 +11874,6 @@ sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132
 md5=3d0f372fb213e09b8d04826f3a0bc2eb
 sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd
 
-[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.5.tar.bz2]
-md5=e34320c97d768191217424af64de380a
-sha256=f8e9efccbccbe1326a0a2579eb86651cf65e0937a38fae1afaec2269208d24a1
-
-[http://downloads.sourceforge.net/navit/navit-0.0.1.tar.gz]
-md5=521fbc102a804f7c26d4240b3f970380
-sha256=d79151209bf6b2d470773968b62258c56313bf857cda8ef27f8e321dd1a9d084
-
 [http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz] 
 md5=76596823cc1a6d1cdf7779b782ff0ee6 
 sha256=39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0
@@ -12721,3 +12661,63 @@ sha256=4edcaf61ad8b4bef65169af2b98d3992be07260f90cca65128dc523d6935bdd8
 [http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.3.0.0.tar.bz2] 
 md5=a51a7d482e3c689394755bb17bda8526 
 sha256=93c656f142f37607c15372dd24c5de9eab82cd79c5d60449174a928d345c2975
+
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.14.tar.bz2] 
+md5=1ef39fb723f9209109134d6f4860cb21 
+sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
+
+[ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.14.tar.bz2] 
+md5=a24475b978982ff8cb2f25be793c6b83 
+sha256=c8feb3eb9d4255a4aff7ca839555293c237c1b2f034c118127e826843c6f0184
+
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.14.tar.bz2] 
+md5=6d3009c157ac6fc803696d6590a48366 
+sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
+
+[ftp://ftp.gnu.org/gnu/binutils/binutils-2.18.tar.bz2] 
+md5=9d22ee4dafa3a194457caf4706f9cf01 
+sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
+
+[ftp://ftp.gnu.org/gnu/m4/m4-1.4.9.tar.gz] 
+md5=1ba8e147aff5e79bd2bfb983d86b53d5 
+sha256=815ce53853fbf6493617f467389b799208b1ec98296b95be44a683f8bcfd7c47
+
+[ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.14.tar.bz2] 
+md5=018d7dd0fa7de01cfdb77c7c55e7ba26 
+sha256=d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
+
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/a/apt/apt_0.7.3.tar.gz] 
+md5=e2e6e23f43bfdf135b923205659dfaf1 
+sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
+
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/b/blktool/blktool_4.orig.tar.gz] 
+md5=62edc09c9908107e69391c87f4f3fd40 
+sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
+
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/d/dpkg/dpkg_1.13.24.tar.gz] 
+md5=d8ec0b2bf86d5277fb50f8d391c0dd4a 
+sha256=8b1ed52659c5f6723f37bf1122508d7f1b82e064aa9db04d18d726bde34c2713
+
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz] 
+md5=3654bbbf01deeb0d804df194e1b1a2b3 
+sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
+
+[ftp://ftp.pl.debian.org/pub/debian/pool/main/p/prelink/prelink_0.0.20061027.orig.tar.gz] 
+md5=9b01aae72da2bb262f29392597847545 
+sha256=e70697c0c23da6b82b330c7db41537ee00dd770da87c92591682f486ab8d1752
+
+[ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz] 
+md5=848f6c3cafeb6074ffeb293c3af79b7c 
+sha256=1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
+
+[ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_4.78.tar.bz2] 
+md5=00360ce2b62de3015fa7e0f8f92179a8 
+sha256=898db51a4016efca7d408163578443238373773357949e1b4978e26807a1fb2b
+
+[ftp://xmlsoft.org/libxml2/libxml2-2.6.29.tar.gz] 
+md5=8b99b6e8b08e838438d9e6b639d79ebd 
+sha256=e34a19e0b9d7ac03874acffd624f181c85a98fb976dc84411d6cd1bdda965992
+
+[ftp://xmlsoft.org/libxml2/libxslt-1.1.20.tar.gz] 
+md5=4ea2dc22a23bf2aa570f868aa86357f8 
+sha256=ce92f00031c885e04cb65ea76c4675b07aa98af9607572fb0d68180c34bf5346
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 92a16d9d6f..1c094a12e4 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -64,7 +64,7 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3081"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3208"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
diff --git a/conf/machine/em-x270.conf b/conf/machine/em-x270.conf
index c2ec694585..95ba519d3b 100644
--- a/conf/machine/em-x270.conf
+++ b/conf/machine/em-x270.conf
@@ -12,11 +12,12 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt  "
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
 
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-#require conf/machine/include/tune-xscale.conf
+#require conf/machine/include/tune-xscale.inc
 
 # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
-# require conf/machine/include/tune-iwmmxt.conf
-require conf/machine/include/tune-xscale.conf
+# require conf/machine/include/tune-iwmmxt.inc
+
+require conf/machine/include/tune-xscale.inc
 
 ROOT_FLASH_SIZE = "128"
 IMAGE_CMD_jffs2 = " \