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

6 files changed, 214 insertions, 7 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index bb61d09889..7c9e3111dc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2118,6 +2118,10 @@ sha256=f7993d26c3606a9b0e32d1eebe716f2294ac37fac014c47744e986fc0ff5e6d1
 md5=8906c67d015cc90e2e70a341d0752a6f
 sha256=b7255a400139d8c41bc7e2ac630ba4c6479e60e4a08295d0338e9edfdc3db00f
 
+[http://ftp.gnome.org/pub/GNOME/sources/atk/1.28/atk-1.28.0.tar.bz2]
+md5=010a85478adc053c016a0a5c9bb52004
+sha256=e4da9fe580d2d55f4e77a138c553b4b32654dfb06bf0715592cc9dbd6355fe87
+
 [ftp://ftp.gtk.org/pub/gtk/v2.4/atk-1.6.0.tar.bz2]
 md5=5e699af22a934ea3c1c1ed3742da0500
 sha256=a838937ee54c9e794df3b0995935c1e35cad4a360c83922380f9429195ea7059
@@ -2646,6 +2650,10 @@ sha256=b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06edcd528c
 md5=95c29d9d10bf2868996c0c47a3b9a8dc
 sha256=30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
 
+[http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.0.tar.bz2]
+md5=d30c5dbf19ca6dffcd9788227ecff8c5
+sha256=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/bigreqsproto-X11R7.0-1.0.2.tar.bz2]
 md5=ec15d17e3f04ddb5870ef7239b4ab367
 sha256=69d82eff84b1cef08a30e3a79de26df0bce7f531a86d2144ee0d5e43fc21ce86
@@ -5050,6 +5058,10 @@ sha256=dcc1809e8477b95317a7ff503cdd8b6d3f85b8d83a3245252ff47cf631523620
 md5=acb98d469ee932d902fdf6de07802b7c
 sha256=99613d6a67f747f52e4184c613f7cba5cbb76af237c9acd04742e3ca24cf56cd
 
+[http://kernel.org/pub/linux/libs/dietlibc/dietlibc-0.32.tar.bz2]
+md5=0098761c17924c15e21d25acdda4a8b5
+sha256=6613a2cae3b39e340779735d7500d284f5a691c5ed67e59a6057e0888726e458
+
 [ftp://source.mvista.com/pub/xscale/pxa/diff-2.4.18-rmk7-pxa3.gz]
 md5=249c7a63a506d302c96be26517a70298
 sha256=ca569dfa1e5cfd2f4134f3f61f667bcfab5e15c7d43c8a6e835d384ac5b31a07
@@ -5174,6 +5186,10 @@ sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015
 md5=d80acad88411e7944b9b085463d53302
 sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
 
+[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.3.tar.bz2]
+md5=880a41720b2937e2660dcdc0d34a8791
+sha256=3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/dmxproto-X11R7.0-2.2.2.tar.bz2]
 md5=21c79302beb868a078490549f558cdcf
 sha256=531b957d9589950a96cbdbf6a8376f31203797948baed311553cc2d2870c78db
@@ -5338,6 +5354,10 @@ sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
 md5=26f6515322ec50691584ac74291b4254
 sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.1.tar.bz2]
+md5=5cb7987d29db068153bdc8f23c767c43
+sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -6034,6 +6054,10 @@ sha256=914319726bcd01a4055b1c5e09671085875af6de2b0d8589841916139574ee11
 md5=2507b5d0f4b2848147fbddd155aa6cfe
 sha256=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
 
+[http://xorg.freedesktop.org/releases/individual/proto/evieext-1.1.0.tar.bz2]
+md5=5c74f61d6f77b2e6a083b2b31000be42
+sha256=47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/evieext-X11R7.0-1.0.2.tar.bz2]
 md5=411c0d4f9eaa7d220a8d13edc790e3de
 sha256=d7dad048a9496058ec19c63e958e5216c27964d8cb766926fd5dcb96ff879f23
@@ -6666,6 +6690,10 @@ sha256=45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320
 md5=85563f1167a3265cf61c8886c318dda7
 sha256=a24640d8ca9c485d7611880193f18e5ae62af07e3b9464904f3602277f1d4097
 
+[http://www.flumotion.net/src/flumotion/flumotion-0.6.1.tar.bz2]
+md5=22a9047871c5aebc84fc7fe4f3e4613d
+sha256=fe348102ecb0a11faab0bfc6b4b48fb9d99c49e4565a9fb52db64bb7cd4ca78a
+
 [http://pypi.python.org/packages/source/f/flup/flup-1.0.1.tar.gz]
 md5=414181781fb0923f884a38503e8e56da
 sha256=270e2e423a0b8e90091fd6f38422c488b67a23494d671764b9ed2e17ca802e16
@@ -7522,6 +7550,10 @@ sha256=c0c315c4190ce1f4ac977cb1e425a11879d5e7d78067207257387299f4d111ed
 md5=abaaedfdba2f5905d9c57ae73105b84f
 sha256=f117903e3753920d16ca2e9f7185a02b3925fe94958a4c65efc2663cf61ca4de
 
+[http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.28/gcalctool-5.28.0.tar.bz2]
+md5=03d8f034ee844888e7ec9ad317096028
+sha256=4271a17bbca56d7b335f18c1ebf350b931565d90e92925b9e5c0585b416f3765
+
 [http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.5/gcalctool-5.5.21.tar.bz2]
 md5=130baf0910aec9c0c5afad8007da90de
 sha256=e5a0f289969d070f4f10f25fb77efdf693805177b07d4eb2dbfe9fe91c2fdab0
@@ -8758,6 +8790,10 @@ sha256=b71f89f9ead65a7d3ccb92f6a6c2fb1719be25d6661dd67a14b5d820ee6831b2
 md5=36a4e5e1b2c7c053779a9a399f6146a2
 sha256=4320c937d4d211ac39633aa39b55e770b9a996697c857e2b8033c40323384709
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.28/gnome-icon-theme-2.28.0.tar.bz2]
+md5=1b6a782e3f733a5dbb8e62e87a7bdc61
+sha256=31ecbd459ae059672793e46c773742897cb95e22ca5900ccdfb2a22aa30f3884
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/0.2/gnome-keyring-0.2.1.tar.bz2]
 md5=2fe5fb39cc18d1a6792fd3281223dfff
 sha256=1c6d5a1732742469ec32ab7297f3b8eacfc0f4bfae5fdb096b603877dde12612
@@ -10326,6 +10362,10 @@ sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9
 md5=641cc7def2d8667b9b4df15e69dba25f
 sha256=1c11d98eb9a1b1bc54becf465e74c2aa4019bb57a31dd70686269af6a9b9e93b
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.25.tar.bz2]
+md5=d29669dd79276c5cd94e1613c03cd9ab
+sha256=0ab2f7e1d818e7af1be99c4eae02ba69d4a1b8f7e3527929a6426f1daa0d4607
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
 md5=2b5958fb0baaf8d1b4eae18f7b13d49b
 sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -10426,6 +10466,10 @@ sha256=b9f1bb98917d9879d46b6a959ce9068471908763f2ca98e480837485e290b106
 md5=6183d61e434b5d34f232248a35571627
 sha256=c875753a6cccd40a79f5824ea5ec51ee4615a4f22103e4adfc6a0221bf615d8e
 
+[http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.17.tar.bz2]
+md5=3998753de6500ee8c18ce1456df43df6
+sha256=70cef839b429dcea0cae342d24bc2e0e5deae01e902a8858e2c7dd76a724cde9
+
 [http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.7.tar.bz2]
 md5=16dd6515fd011ad449e5ce191dbb94be
 sha256=24520b3e33f98a3bcc79ad68f7d426475cbacf12e4c56338f58a05158523d71d
@@ -10470,6 +10514,10 @@ sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
 md5=f7b2e300d2d85756407ec529424ab237
 sha256=cf750821040102d2c9fbfed56472a86fd0d8c24ada37901c41867c88438a776d
 
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.25.tar.bz2]
+md5=88544e034a051baf472983791d233076
+sha256=39b2ba7b3bfa8df6d998a9461e7091c27757e36a53e93969d7d9982a56526578
+
 [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
 md5=263a7800ecf44d0f38d0cbc80bce65ff
 sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
@@ -11798,6 +11846,10 @@ sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
 md5=dcc36554aea1338b3813943daf1e9988
 sha256=ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
 
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.bz2]
+md5=0f7acbc14a082f9ae03744396527d23d
+sha256=472f57f7928ab20a1303a25982c4091db9674c2729bbd692c9a7204e23ea1af4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/inputproto-X11R7.0-1.3.2.tar.bz2]
 md5=0da271f396bede5b8d09a61f6d1c4484
 sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
@@ -12746,6 +12798,10 @@ sha256=ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d
 md5=4ab4e67e0b8845aa201e984153087f4a
 sha256=13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
 
+[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.6.tar.bz2]
+md5=2d39bc924af24325dae589e9a849180c
+sha256=a8346859505d2aa27ecc4531f1c86d72801936d96c31c5beaeff4587441b568b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libICE-X11R7.0-1.0.0.tar.bz2]
 md5=c778084b135311726da8dc74a16b3555
 sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac
@@ -12790,6 +12846,10 @@ sha256=57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
 md5=05a04c2b6382fb0054f6c70494e22733
 sha256=7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
 
+[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.1.1.tar.bz2]
+md5=6889a455496aaaa65b1fa05fc518d179
+sha256=f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libSM-X11R7.0-1.0.0.tar.bz2]
 md5=8a4eec299e8f14e26200718af7b2dcfc
 sha256=df219b7d5c2fac93bc7c8eb411ed365492eaeb3727ecbb04999890fd694d4e80
@@ -12842,6 +12902,10 @@ sha256=d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
 md5=c6265b59ea2b594fd68e33f9125b4d20
 sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
+md5=0545089013213e90aac19b8f8045d32e
+sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2]
 md5=dcf59f148c978816ebbe3fbc5c9ef0e1
 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248
@@ -12858,6 +12922,10 @@ sha256=6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67
 md5=93f84b6797f2f29cae1ce23b0355d00d
 sha256=4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.0.tar.bz2]
+md5=33e54f64b55f22d8bbe822a5b62568cb
+sha256=5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXScrnSaver-X11R7.0-1.0.1.tar.bz2]
 md5=b9deb6ac3194aeab15d8f6220481af6d
 sha256=66287d18ebe2b239b7b0adc02f4d40b6ea918761e5fde6b8db9c180742618c94
@@ -12882,6 +12950,10 @@ sha256=d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b
 md5=0f2b88d857e0a3f5898e4759c541af46
 sha256=10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.bz2]
+md5=993b3185c629e4b89401fca072dcb663
+sha256=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXau-X11R7.0-1.0.0.tar.bz2]
 md5=51ceac78ae0eaf40ffb77b3cccc028cc
 sha256=9500d088e1b3cbf107a93703b81d4636f778492c1c1d14dea6aca7b8354e39e8
@@ -12902,6 +12974,10 @@ sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
 md5=64e7782db4653cb57c7f7e660b2431c3
 sha256=2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.6.tar.bz2]
+md5=066218dceb82eb8da0e11d259ed3ceda
+sha256=20c1ecad21474187b340cd6056b1083da8cfa5d919d208feac360644108db587
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
 md5=ded3c7ed6d6ca2c5e257f60079a1a824
 sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
@@ -12918,6 +12994,10 @@ sha256=d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b
 md5=7e95395dea89be21bae929b9b7f16641
 sha256=7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.1.tar.bz2]
+md5=0f1367f57fdf5df17a8dd71d0fa68248
+sha256=3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXcomposite-X11R7.0-0.2.2.2.tar.bz2]
 md5=5773fe74d0f44b7264bd37c874efc7b1
 sha256=d3d0e8883171a38802400836ba2bf7a40f3b22f669db80e01509c400137c5228
@@ -12926,6 +13006,10 @@ sha256=d3d0e8883171a38802400836ba2bf7a40f3b22f669db80e01509c400137c5228
 md5=f5229a7a38bc3d90380b7c18de10db5e
 sha256=142cd1c1958e2cb92ff2975a092a2c519dd5f4c433c9d1d8b6cc9ca967aad283
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.10.tar.bz2]
+md5=7dcdad1c10daea872cb3355af414b2ca
+sha256=b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd
+
 [http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.8.tar.bz2]
 md5=ec2acd10a7736a85dd1e1ed9ea5bec96
 sha256=8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377
@@ -12950,6 +13034,10 @@ sha256=5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636
 md5=ac0ce6b0063a9858c8f24ddb4c60487d
 sha256=0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.2.tar.bz2]
+md5=b42780bce703ec202a33e5693991c09d
+sha256=a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXdamage-X11R7.0-1.0.2.2.tar.bz2]
 md5=e98c6cc1075db5f6e7e6c8aef303c562
 sha256=bba5acb547fee5c33d582cbd55ad8d03965b582808912a20a457c8b78ca04184
@@ -12962,6 +13050,10 @@ sha256=96d4b70a3853894ceb4c71c3b44a0816014894bad63f494ddfcd30a89caa76c8
 md5=10facf2bc7cbd5e5c1a698b8a210a582
 sha256=f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.0.3.tar.bz2]
+md5=d60941d471800f41a3f19b24bea855a7
+sha256=d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXdmcp-X11R7.0-1.0.0.tar.bz2]
 md5=509390dc46af61e3a6d07656fc5ad0ec
 sha256=a9f12dc2d3dff9a36904fd1d14fed3cc1b84dfa5661349e88ad164a4107cc878
@@ -13010,6 +13102,10 @@ sha256=322db66638b6db7144ca8028ea968e7aa92d0381e08b99f00ec12193ed624bdc
 md5=1990d19725a3c7f32290037f02d3737f
 sha256=547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.4.tar.bz2]
+md5=7f2c40852eb337b237ad944ca5c30d49
+sha256=ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfixes-X11R7.0-3.0.1.2.tar.bz2]
 md5=5a027e5959dae32b69dce42118938544
 sha256=bdcb52a46967aca4367e276f88de35354daa5a62b4d0776e6a89dc43c2d336e6
@@ -13062,6 +13158,10 @@ sha256=cdd0f39c99d02b38e804c7dc2c7fdbdd956b8a0b68d2ebcaf7bf434533f58f1e
 md5=1adca018aa7bf2d215f20a69c10828ad
 sha256=ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2]
+md5=bbd37768c87f63cf2eb845b2c0f56515
+sha256=0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfontcache-X11R7.0-1.0.1.tar.bz2]
 md5=1e3c7718ffaf4f617d3f67ada5a7601e
 sha256=3ae73ba79b28499082ea81527caf032004d5a884bf69ec8b8508dedd913556b8
@@ -13106,6 +13206,10 @@ sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
 md5=cfb36307e8e7ffafe40848dba24e0b11
 sha256=a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.3.tar.bz2]
+md5=8df4ece9bd1efb02c28acb2b6f485e09
+sha256=362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
 md5=99503799b4d52ec0cac8e203341bb7b3
 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -13122,6 +13226,10 @@ sha256=d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d
 md5=cd9f7c46439ac40e0517a302d2434d2c
 sha256=07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.tar.bz2]
+md5=a2ac01fc0426cdbb713c5d59cf9955ed
+sha256=e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXinerama-X11R7.0-1.0.1.tar.bz2]
 md5=1a1be870bb106193a4acc73c8c584dbc
 sha256=72b5a499ddce72f1e18963586f7fb67e8ef69f989be455ba2c5d7f4d9b5f467a
@@ -13134,6 +13242,10 @@ sha256=b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66
 md5=fb372a5f3ab42b5ba16d7af4d833a0cb
 sha256=f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.0.5.tar.bz2]
+md5=fc4d66be7a1a1eb474954728415e46d6
+sha256=0692b6b0ec1019cfaa8418020b1127bfb0975f5a579a0b1f9eb7fd8f2f7126d7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXmu-X11R7.0-1.0.0.tar.bz2]
 md5=df62f44da82c6780f07dc475a68dd9fa
 sha256=537ba847b3a7665e7c84dfa3d6d1719db495e780f87a3e4583671c5aafbd0e29
@@ -13250,6 +13362,10 @@ sha256=ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345
 md5=f3bdd67785ace8cd0b23249e9d8c9975
 sha256=43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.7.tar.bz2]
+md5=96f3c93434a93186d178b60d4a262496
+sha256=706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXt-X11R7.0-1.0.0.tar.bz2]
 md5=d9c1c161f086a4d6c7510a924ee35c94
 sha256=dad0c901d3a542866dae53df27994498f320fb1981be2820d2ded81f4bf840f5
@@ -13266,6 +13382,10 @@ sha256=eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
 md5=090c1ad04e34982eada5cf3b1a0792fd
 sha256=b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.1.0.tar.bz2]
+md5=dd6f3e20b87310187121539f9605d977
+sha256=bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXtst-X11R7.0-1.0.1.tar.bz2]
 md5=3a3a3b88b4bc2a82f0b6de8ff526cc8c
 sha256=93d9c1fb831e2aaaab4627835e79ae0550837cbe18a0d6bc91edc2aa3ea67ad3
@@ -13278,6 +13398,10 @@ sha256=f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b
 md5=723a0275227165383e967a1ca8899b52
 sha256=4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.5.tar.bz2]
+md5=1d97798b1d8bbf8d9085e1b223a0738f
+sha256=d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXv-X11R7.0-1.0.1.tar.bz2]
 md5=9f0075619fc8d8df460be8aaa9d9ab5d
 sha256=b3bcacd212b1aac947cdfe7e64175255f0302bc5a461e2c8925e3cf491532b10
@@ -13302,6 +13426,10 @@ sha256=8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
 md5=6f5f621804ee652b6cc6f2025c517c78
 sha256=59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.1.tar.bz2]
+md5=368837d3d7a4d3b4f70be48383e3544e
+sha256=8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86dga-X11R7.0-1.0.0.tar.bz2]
 md5=d2154a588953d8db4ae6252ebc7db439
 sha256=8bc2f9b7efe25f9765db6963501bcb06efef292006e184d5fe3f8b8f2a9c5199
@@ -13314,6 +13442,10 @@ sha256=ed3bd1cc72252aebe8268c7357692dcdb72f003c2c36ee7a74da312b750afdb7
 md5=7cee0df63903cef7f7a3fb68cdd99eef
 sha256=2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-1.0.2.tar.bz2]
+md5=51fed53e8de067d4b8666f75a0212400
+sha256=8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86misc-X11R7.0-1.0.0.tar.bz2]
 md5=338568c9ca48b801f314c89c97327397
 sha256=94ea1585a426e1d36f9067d65b176c27d3fbecfdf59a076263014292d10862c5
@@ -13330,6 +13462,10 @@ sha256=e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
 md5=304d37bd0a10d9b58aa9b64469ad73e5
 sha256=3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.0.tar.bz2]
+md5=b431ad7084e1055fef99a9115237edd8
+sha256=7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86vm-X11R7.0-1.0.0.tar.bz2]
 md5=ed59db622581b33ec2a62e12b2f9c274
 sha256=f972bbd632cf9047a28b4c467a2f7c2c72f9b36959a98649b3dfef6bf898b8df
@@ -13674,6 +13810,10 @@ sha256=bd9669e5f1a43d1cfcff4d3dc5f18736ba7c950c8ba7b71b1d9cf4436a3783b3
 md5=4d866967210d06098fc9f302ed4c79b1
 sha256=fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
 
+[http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.0.tar.bz2]
+md5=a2fcf0382837888d3781b714489a8999
+sha256=1904a8f848cc5d76105cb07707890aca095540a37fb0a63d359f71da51d3e2d5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libdmx-X11R7.0-1.0.1.tar.bz2]
 md5=ae6b3c48f1349fc5dfa7d7c4b9cf4718
 sha256=3dfb83a88826c7250e41180442e891ac39898e46e0c9c1c2aba352d4a4aa9973
@@ -15070,6 +15210,10 @@ sha256=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc
 md5=ba25eb7582f69428648e8c67564d68e5
 sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
 
+[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.9.tar.bz2]
+md5=685cb20e7a6165bc010972f1183addbd
+sha256=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead
+
 [http://www.xmailserver.org/libpcl-1.4.tar.gz]
 md5=6d63c462911349de80109c0161ed6d37
 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
@@ -15830,6 +15974,10 @@ sha256=468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
 md5=0726a845fe5a56551de2718c9f6b0e35
 sha256=0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
 
+[http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.6.tar.bz2]
+md5=b01156e263eca8177e6b7f10441951c4
+sha256=2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libxkbfile-X11R7.0-1.0.1.tar.bz2]
 md5=0b1bb70a1df474c26dd83feab52e733d
 sha256=2260663af7613e35996e7aa1e8911a062e849619bce88086529031e6c479c9ed
@@ -19890,10 +20038,18 @@ sha256=b7716971e73c8fa96ecd9cdb598c8bd3a2a946e289cfef5dcfaa11a0022737ce
 md5=47841c7ff5c81a7b349a79f2fa8e9138
 sha256=95550343a0f013301c20a0d27f681b97fbf61379b7bb14ecee4057141891b5f2
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.9.bz2]
+md5=ae8a07de27292d2957772e89f2dd921b
+sha256=0f32fb48b0c13991bc1a29f378e6435ff3d56408e8952e790ad25597e8870540
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.1.bz2]
 md5=43977a0a264dd7d173b6ef122c62fb20
 sha256=34586de4c7d1517842dfe32a8621f945cd6b8ee55096f8f053a66accd3d17a41
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.3.bz2]
+md5=24d60ad6645211e2c08dc1c1c578b249
+sha256=ed167dcbdf52c2563a30e7c81a0f2b3d79eb04acc5728e6d484166a4fe8a39e4
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -24854,6 +25010,10 @@ sha256=a2889bee9c45575b284564dbc27cf3dc6cb9833d4ff643976a1b3dba2d763f86
 md5=dfbe65c1e31bb7de5f5b03d50de192b5
 sha256=b0037cf21b67779ef5a0c585b32e46bde3b78df889484c78bb4318c9b448f560
 
+[ftp://ftp.denx.de/pub/u-boot/u-boot-2009.08.tar.bz2]
+md5=cd4788ea1c6ac4f9b100b888a1063a6b
+sha256=858fd04efd5b98e99fd1a074998b1a8ac5fbd07b176de1d20d8eb148492d949d
+
 [http://linux.omap.com/pub/bootloader/2430sdp/source/u-boot-SEP1106.tar.gz]
 md5=49c07dec9e1be69fd01d46f47ec03731
 sha256=a090786113b02647413ebc15888af269f2e6d50f73cbb94b0619cc1702911dae
@@ -26178,6 +26338,10 @@ sha256=1584dcd6d9f5206b1b44eb4645b09b809cb8a6b06eef8b7d6dc9615906692e1b
 md5=fde0b050901f024b19159cdacdcfbd20
 sha256=b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
 
+[http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.0.tar.bz2]
+md5=7b83e4a7e9f4edc9c6cfb0500f4a7196
+sha256=de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xcmiscproto-X11R7.0-1.1.2.tar.bz2]
 md5=77f3ba0cbef119e0230d235507a1d916
 sha256=f28e8f6baaaa590ed991314c98f16d114e4668b93c5c6e7fb1bf51f3cc7bf6c0
@@ -26386,6 +26550,10 @@ sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
 md5=e6841018a7c64983b0954aa2c564d115
 sha256=d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
 
+[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.bz2]
+md5=fb6ccaae76db7a35e49b12aea60ca6ff
+sha256=6d0abd31ddd57c2cb24cecf5fd90b4c29a276e20e3e03ca3c2c57d074f964d99
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2]
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
@@ -27750,6 +27918,10 @@ sha256=13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8
 md5=a318c1e86123832d7b0c95fc7d47ef35
 sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2]
+md5=120e226ede5a4687b25dd357cc9b8efe
+sha256=ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86bigfontproto-X11R7.0-1.1.2.tar.bz2]
 md5=5509d420a2bc898ca7d817cd8bf1b2a7
 sha256=56498126f54f123e2ffde0a883ccbc914097818e85bfa6b2a4a47df687f50b79
@@ -27770,6 +27942,10 @@ sha256=3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
 md5=42fdcebc66efac02ab4beec2b1b0ad6e
 sha256=5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2]
+md5=a036dc2fcbf052ec10621fd48b68dbb1
+sha256=ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86dgaproto-X11R7.0-2.0.2.tar.bz2]
 md5=48ddcc6b764dba7e711f8e25596abdb0
 sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf
@@ -27806,6 +27982,10 @@ sha256=861b881e2ac1e9164048c06217b54dffb5d88feb0bf72abf31984e663843b923
 md5=f00844a63d6e76b69eb0eb5e41eed843
 sha256=07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.tar.bz2]
+md5=4434894fc7d4eeb4a22e6b876d56fdaa
+sha256=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2]
 md5=475f19a2ffbfab9a0886791c5f89c978
 sha256=2497487e51cb2e94dfe540b9084f625f8018eb0853a699d724be790b26d9fd15
@@ -28182,6 +28362,10 @@ sha256=fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672
 md5=6cc96c3e4ed5d9802fe717beac008f19
 sha256=204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
 
+[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.1.1.tar.bz2]
+md5=38c387bacdc01038c8ac280588792bcf
+sha256=9775bcfd43d9ffa41e2865e5b2c933f419bf983d7a529b3103656c76fd82e663
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbcomp-X11R7.0-1.0.1.tar.bz2]
 md5=46d1e015897200d4dfed64990abaa8b9
 sha256=35825e80fa1905111302b5c069f5419f5fe63b370f9c437adb8c901fc10cfd16
@@ -28406,6 +28590,10 @@ sha256=4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
 md5=626731003ec22a74ecf9e44ed098bbdf
 sha256=c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f
 
+[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.4.tar.bz2]
+md5=bbe021f812e0014a8ee3692317788119
+sha256=805a63525d99f59d60a11aa89121fb9cdb001c8d542237ac4deafbadc7bd0bed
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmodmap-X11R7.0-1.0.0.tar.bz2]
 md5=240ed53111925e005d2f138ea98ef5e1
 sha256=017530da4262a6e52c87cb8ea47aebc83fcd82346cc8072f02ba9de060407be3
@@ -28650,6 +28838,10 @@ sha256=6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592
 md5=1a2b31430d04340be2e49e8b6445e076
 sha256=fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
 
+[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.16.tar.bz2]
+md5=75c9edff1f3823e5ab6bb9e66821a901
+sha256=8224da1ce19c0ded4e07a325f3ed62bb4453782db97fd175cb3ffd1acaeb9672
+
 [http://xorg.freedesktop.org/releases/development/X11R7.2-RC3/proto/xproto-7.0.9.tar.gz]
 md5=937c572775ff4a2edfbbf5568dc0e959
 sha256=e68db1c55c1c6d398098d69096b3c3b35863b5d25ef216cb2d1d4364ab0000af
@@ -28682,6 +28874,10 @@ sha256=632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303
 md5=41a9d0cc073fa6165a31fbf9e85f68a6
 sha256=ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207
 
+[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.2.tar.bz2]
+md5=2cb19bb1c19ccf77c40032b03dbe06f0
+sha256=34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrandr-X11R7.0-1.0.1.tar.bz2]
 md5=e433ccca3c4f9ab8609dfd1c9c8e36ea
 sha256=40ccd95d26c43d326fb8396ca758334bf34854336007b46285d3e881cb66e73a
@@ -28806,6 +29002,10 @@ sha256=5de3bc0c021647606fd23863f44508f851252bebce579f920e020caed74b63f0
 md5=ac2515a68bc3c5cf3729aa2ff4edebdf
 sha256=d9991f22b5f52bc4cfe579f4e3fbb6d04f8d7ce575bd04a94372c14584ddfd34
 
+[http://gpe.linuxtogo.org/download/source/xserver-common-1.32.tar.gz]
+md5=cdb63bb95074cfb778250defc3ca585e
+sha256=a10641a046f39d6044882ec8bf44d28020291b75006374245daab1b73c0dab15
+
 [http://gpe.linuxtogo.org/download/source/xserver-common-1.8.tar.gz]
 md5=1e2b9633a0cef8c525d66026a9f22c87
 sha256=cfbe37b066beee3c3a6e85806fc1588aa737b7bd7b3647e9eb91e03f21571527
@@ -28830,6 +29030,10 @@ sha256=0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11
 md5=2f41fd983ba4d89419204854936025e2
 sha256=6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad
 
+[http://xorg.freedesktop.org/releases/individual/app/xset-1.1.0.tar.bz2]
+md5=eeb0d02f69c76bd40470dede99b4bd49
+sha256=72c859c6030890a25cf828d0b2743454e50eadab30f6be8c17172fe97a554643
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xset-X11R7.0-1.0.1.tar.bz2]
 md5=a0350e334a215829166266e2ce504b1c
 sha256=db17d017fff06df2e47f9d123bfb4f1d63a063eb3c08ec017292cc206bb293d1
@@ -28930,6 +29134,10 @@ sha256=9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd
 md5=f9cf791dfad59cf044e276aab3a71e1d
 sha256=a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
 
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.4.tar.bz2]
+md5=b3b57e78dc06885e79f8393a83619715
+sha256=a26adb573ec47a21a8772d8ad89690c629c9128f8d3037d9037b032ae24cc76e
+
 [http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.tar.bz2]
 md5=a91fef8b932b21992af7dfff7b2643f3
 sha256=d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 8e0fbc00fb..a63c204441 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -38,7 +38,7 @@ UDEV_GE_141 = "1"
 PREFERRED_VERSION_usbutils = "0.82"
 PREFERRED_VERSION_util-macros-native = "1.2.1"
 PREFERRED_VERSION_util-macros = "1.2.1"
-PREFERRED_VERSION_wpa-supplicant = "0.6.7"
+PREFERRED_VERSION_wpa-supplicant = "0.6.9"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 PREFERRED_VERSION_xserver-xorg = "1.6.1"
 
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 2a1b7b059c..ab3606dcca 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -1,10 +1,10 @@
 # eglibc:
 require conf/distro/include/eglibc.inc
 
-TARGET_OS = "linux"
+TARGET_OS = "linux-gnu"
 
-TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
+TARGET_OS .= "${@['','eabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS .= "${@['','spe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'powerpc'] and bb.data.getVar('MACHINE',d) in ['calamari']]}"
 
 #TARGET_OS = "linux-gnuspe"
 
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 287bd9bd77..544ee4a013 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -3,7 +3,8 @@ require conf/distro/include/glibc.inc
 
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers"
 
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+TARGET_OS = "linux-gnu"
+TARGET_OS .= "${@['','eabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3b4fb8f302..580702b991 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -101,7 +101,6 @@ SRCREV_pn-libw100 ?= "47"
 SRCREV_pn-libxcalibrate ?= "209d83af61ed38a002c8096377deac292b3e396c"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-bfin ?= "3758"
-SRCREV_pn-linux-bug ?= "9110"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf
index c25121659c..4b383be204 100644
--- a/conf/machine/qemux86.conf
+++ b/conf/machine/qemux86.conf
@@ -5,7 +5,6 @@
 require conf/machine/include/qemu.inc
 require conf/machine/i686-generic.conf
 
-MACHINE_FEATURES += "x86"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d"
 
 KERNEL_IMAGETYPE = "bzImage"