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

5 files changed, 112 insertions, 29 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 92f3c6faef..26edb2eb4b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2854,6 +2854,10 @@ sha256=ed7631a6d22b456eb26b881bdbe46ea47f93d2f192da420408bad4bbc245f796
 md5=ed24b291e9a724a37bc8e9d04adae413
 sha256=31f058fb722dfb96a7b496a064e0c46d634d7dffdd5b64c7dce3ab6ec2fa48bc
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.47.tar.gz]
+md5=b54a199004b578ec5652014a5e62aeaa
+sha256=830bb7da6836b0c709abee212ed8387e1ad8cd7087ed0b925fad3d16b0113b76
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -3246,6 +3250,10 @@ sha256=9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e
 md5=aeb526108f13b91c02b115c8d86f9659
 sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
 
+[http://www.busybox.net/downloads/busybox-1.14.3.tar.gz]
+md5=dfb197b8de260ff284f7222ed23614fe
+sha256=b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163
+
 [http://www.busybox.net/downloads/busybox-1.2.0.tar.gz]
 md5=6af69ebbbf8adc874ccb6d67dca95df5
 sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0
@@ -4354,6 +4362,10 @@ sha256=b1f47a0177a5b13d317ab1f6570510502739909ede550e7da08ba814c3c73ae8
 md5=c299c5e0f20f633791b4c4f7ced4effe
 sha256=a0e28b019f022942650ffa4bdf46e4c09bd8ec18e6ca5f08ad273668115f51f7
 
+[http://curl.haxx.se/download/curl-7.19.5.tar.bz2]
+md5=426d161661dce70c8ea9ad8f553363a3
+sha256=05ad84a9c8d340917370f357ad9fdce5ea595deb11f4cb70f946fa48c7b02cd0
+
 [http://downloads.sourceforge.net/curlftpfs/curlftpfs-0.9.2.tar.gz]
 md5=b452123f755114cd4461d56c648d9f12
 sha256=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958
@@ -4538,6 +4550,10 @@ sha256=6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
 md5=b57aa1ba0834cbbb1e7502dc2cbfacc2
 sha256=8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86
 
+[http://dbus.freedesktop.org/releases/dbus/dbus-1.3.0.tar.gz]
+md5=b3298d5ce0e4ad4731b1e4e1787d56bb
+sha256=fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
+
 [http://freedesktop.org/software/dbus/releases/dbus-glib-0.71.tar.gz]
 md5=4e1e7348b26ee8b6485452113f4221cc
 sha256=b58a489fdd35a70d241f512bc08f3b6d9d8e05110f4a1d5341cff6a0b7d854b7
@@ -4558,6 +4574,10 @@ sha256=8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3
 md5=d4aa04b9df35b4bd663be38e959941c8
 sha256=ca366fed6035f75c6ca038f99b780260a0e19f282067b2dd20243ba54105fc21
 
+[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.82.tar.gz]
+md5=aa2a4517de0e9144be3bce2cf8cdd924
+sha256=ddfb062797341b5c5a22555ffe80138953cc61a67ba805647b2746f519bfbde1
+
 [http://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.3.tar.gz]
 md5=eeec2c3ae0a857c75fd3ac96e0612921
 sha256=6ca8464a04d08232968d1ffca3d3f777f55dc39326040c487f50f52d4272e820
@@ -7362,6 +7382,10 @@ sha256=309f614a3c7fee88edc4928ff17185a19533949a1642ccf776e87d86303704de
 md5=cf5d787bee57f38168b74d65a7c0e6fd
 sha256=c5fe6f4c62ee7288765c3800ec9d21ad936bdcb5a04374cc09bd5a4232b836c9
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.1/gcc-4.4.1.tar.bz2]
+md5=927eaac3d44b22f31f9c83df82f26436
+sha256=cbefa9abd4adac0931e1b556072dcd8b32a360d4b95a94d7822c86bded803d5b
+
 [http://downloads.sourceforge.net/mingw/gcc-ada-3.4.5-20060117-2-src.tar.gz]
 md5=30154205636c12c6abcc462ce07550cf
 sha256=404358fe19326679f602de6f7d6a2db180e27af83813150f58ab28eec197b646
@@ -11978,14 +12002,14 @@ sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
 md5=baa1f6e0b6acbf9576bb28cca5c32c89
 sha256=6a2efdfc757c518a8185f457799506086084b59498f53db37cfb6728008127e0
 
-[http://kernel.org/pub/linux/libs/klibc/Stable/klibc-1.5.tar.bz2]
-md5=481dfdef7273f2cc776c2637f481f017
-sha256=27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
-
 [http://kernel.org/pub/linux/libs/klibc/Testing/klibc-1.5.15.tar.bz2]
 md5=db2152a8a03bd81e21a5f451f537ae3d
 sha256=8b5334ef88b075f374b031695181b4302c3e5621bf2737a39fdf28262b0f80f4
 
+[http://kernel.org/pub/linux/libs/klibc/Stable/klibc-1.5.tar.bz2]
+md5=481dfdef7273f2cc776c2637f481f017
+sha256=27000ba4bc73a5977502b27d7036df24dd6ab94a1c33b8f5d6d54ba62772f0c7
+
 [http://downloads.sourceforge.net/klimt/klimt-src-0.6.1.zip]
 md5=d12f56384b4ccde11cd756db2b14065c
 sha256=48ae508d72e453e2a1f5748870362259786b475548c545feaec1aea71d2f8fdb
@@ -13422,6 +13446,10 @@ sha256=01cb83ef0e765c9856bed79c18a766eed2027f2b2576e8eaa14e02c15c7658fd
 md5=1ac35c278299fcbc69b7dde79a642d89
 sha256=26c7d9c1b7a41f28fea5213484b274be55dcf2bbf5eac723ad795c0c5fb85df6
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.3/libgee-0.3.0.tar.bz2]
+md5=1ca2b8a87950ef1b14342fb32db3e558
+sha256=fd373e48bbe7a8f4903bd405f6310223321bc1ab22c7c3a7bc6ab0a11256b597
+
 [http://gpephone.linuxtogo.org/download/gpephone/libgemwidget-0.1/libgemwidget-0.1.tar.bz2]
 md5=95d269ad7e7cb7d3032498ad2e47643b
 sha256=b8a1da871aa34362caf0c76dcbd3df42aef7313a4ed08f38eddcb159b80302c5
@@ -15278,6 +15306,10 @@ sha256=06e4be5214166e1de11715c8b58c61d1a1930df1b6bea035ee6b6a227054ae5b
 md5=dc43ff7ae6aded45f578c87b7b0c8766
 sha256=c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980
 
+[ftp://xmlsoft.org/libxml2/libxml2-2.7.3.tar.gz]
+md5=8f4fda3969237c2a33bdb1583b5d06b2
+sha256=432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98
+
 [http://gpe.linuxtogo.org/download/source/libxsettings-0.11.tar.gz]
 md5=ea623deae839c41ef68c9a31233157ef
 sha256=4cae17ea07445660cedb34a8a0222055954ed67de3d5a527850d8b9e923e3543
@@ -17982,6 +18014,10 @@ sha256=da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25
 md5=45cee6d1ebf8fe46e412fd818b8e7b74
 sha256=385a606007eb14f5847f033ac6fa8ea48366597ad1f93aa99864e1f82e23ac88
 
+[http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.4p7.tar.gz]
+md5=8c19ff62ed4f7d64f8e2aa59cb11f364
+sha256=5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
+
 [http://doolittle.icarus.com/ntpclient/ntpclient_2003_194.tar.gz]
 md5=94e84d5c6023c5e1f3890b28d0a08c92
 sha256=3f515a043bcd3b778d33938da224214e727faa528256d4a1a213bc8617ac2d0b
@@ -18706,6 +18742,10 @@ sha256=49b2e7ecaac26c3d87ccd26279bc0536baa50f1e140b36e14fbeedde76aad0ef
 md5=8aea6f3bb0dc9fdb52ed3f0e9d84fa79
 sha256=070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d
 
+[http://downloads.sourceforge.net/owfs/owfs-2.7p23.tar.gz]
+md5=654dcf9f3987d49a35b4bb92e464234a
+sha256=1391df01a619c6df0049706fb7bd4c690c55439b7bee4d5e8c564525cefdede2
+
 [http://openzaurus.org/mirror/oz-compat_0.5.tar.gz]
 md5=0005d4068b2227e26f4583c1a7415e97
 sha256=8db9b3948c607315f0ba0df61b32f747bec5479c38051d3e0e55b31b82c81af5
@@ -21754,6 +21794,10 @@ sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732
 md5=ceef10579a75c92483171f3bd7f77df2
 sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
 
+[http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2]
+md5=ceef10579a75c92483171f3bd7f77df2
+sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7
+
 [http://uazu.net/sbagen/sbagen-1.4.1.tgz]
 md5=7d672f2f2a8e33e664b06777459471fe
 sha256=3190534f4449f810d633b0a9848c7db1458b4c57249432a3932a468ecb06daea
@@ -24506,6 +24550,10 @@ sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a
 md5=9e5888a79757eb0f47df118b39762ed6
 sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5
 
+[http://www.freesmartphone.org/sources/vala-0.7.5-fso2.tar.gz]
+md5=1a10e3c3d7c8eab324ecb0d8b81732bd
+sha256=4dfd1ff2793f71ab11d842ff4379a676a30af4287b7b6892ba9733bf7b691c10
+
 [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
 md5=9407d33961186814cef0e6ecedfd6318
 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
@@ -25034,6 +25082,10 @@ sha256=cff48f9a87e94672c7a819661a3a5c893ee44e763c6e5775d00aff3de43619b1
 md5=d092f6a80d38d361cb7a6d54d7699678
 sha256=465e5d5a9dee6284574fa065dcde5cc17a2907f153239ad4a4917e82abb8de6b
 
+[http://wvstreams.googlecode.com/files/wvstreams-4.6.tar.gz]
+md5=4ee8ccfe6dfc29bf952d58fa23626c97
+sha256=171df8e545b53edb3efbd65b9bc2b35549d05249bd0c92776701f9d8da77ed6f
+
 [http://ftp.de.debian.org/debian/pool/main/w/wvstreams/wvstreams_4.2.2-2.2.diff.gz]
 md5=58e1df79ce031b256417ba5992cce833
 sha256=f203a843f11d53ed075a03c07a85e2b5d43dec4cff4da791a96265dfdbee1030
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 8ceb233f2f..a66a37fdd0 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -2,8 +2,12 @@
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-devel = "${AUTOREV}"
-SRCREV_pn-fsod = "${AUTOREV}"
 SRCREV_pn-fsodeviced = "${AUTOREV}"
+SRCREV_pn-fsogsmd = "${AUTOREV}"
+SRCREV_pn-fsogpsd = "${AUTOREV}"
+SRCREV_pn-fsonetworkd = "${AUTOREV}"
+SRCREV_pn-fsotimed = "${AUTOREV}"
+SRCREV_pn-fsousaged = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-term = "${AUTOREV}"
@@ -11,16 +15,25 @@ SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-fso-gpsd = "${AUTOREV}"
 SRCREV_pn-fso-monitord = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
+SRCREV_pn-fso-specs = "${AUTOREV}"
+SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libascenario = "${AUTOREV}"
 SRCREV_pn-libeflvala = "${AUTOREV}"
+SRCREV_pn-libfsobasics = "${AUTOREV}"
 SRCREV_pn-libfsoframework = "${AUTOREV}"
+SRCREV_pn-libfsotransport = "${AUTOREV}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
+SRCREV_pn-libfso-glib = "${AUTOREV}"
+SRCREV_pn-libgee = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
 SRCREV_pn-libgsm0710mux = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
+SRCREV_pn-misc-vapi = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
 SRCREV_pn-vala-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
new file mode 100644
index 0000000000..aef87a62a5
--- /dev/null
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -0,0 +1,39 @@
+# To be included from sane-srcrevs.inc
+
+# FSO Projects -- Cornucopia
+FSO_CORNUCOPIA_SRCREV ?= "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}"
+# FSO Projects -- Misc
+SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69"
+SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80"
+SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf"
+SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915"
+SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
+SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-monitord ?= "eb8fb32d52d19c5aa9284c6cc540dd40bb924c9d"
+SRCREV_pn-fso-sounds ?= "cc46b55131fc07a415bf1bd62ce98f73344489cb"
+SRCREV_pn-fso-specs ?= "66c992afd6c551ffd8fc63d7201c5cce269a4d77"
+SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
+SRCREV_pn-libeflvala ?= "c566847e000fad132225aefd854b81ae713eaa82"
+SRCREV_pn-libfso-glib ?= "b855b0297ff68bb505a02d9b4b13914ca558cd59"
+SRCREV_pn-libframeworkd-glib ?= "680276e4cddabeb1edd088ddd421f363dd106a50"
+SRCREV_pn-libgsm0710 ?= "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
+SRCREV_pn-libgsm0710mux ?= "b74d4615374abb856441e4a416726fb3e8d7835b"
+FSO_PYTHONHELPERS_SRCREV ?= "6d7f51b5189a00a07d9b88100a565f46fcb62644"
+SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-fso-apm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "0d221b688bfb51e0607b7f4e6e03bf96d13d5d44"
+SRCREV_pn-vala-terminal ?= "2f849c5690d834a69f6c0693cc159573b3aa78d"
+SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
+SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 7297f4710b..342d785d29 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -34,7 +34,6 @@ SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dasher-gpe ?= "1251"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dbus-c++ ?= "13131"
-SRCREV_pn-dbus-hlid ?= "e82bb41c8f7b41b85db918166db6682962853713"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-diversity-daemon ?= "571"
@@ -55,16 +54,6 @@ SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd ?= "1b57e0a6bab423f4f74c0107b4bb9bd83733ee42"
-SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52"
-SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "0c713f42f078ae4aa3138ea487f044b9cd9d525b"
-SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
-SRCREV_pn-fso-term ?= "2cd15459c689d56e3ddde761129f4b00beab68ef"
-SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
-SRCREV_pn-fso-gsm0710muxd ?= "af1b80c7ded08b697730c3191d110dfd6dd872d3"
-SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
-SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gabriel ?= "38"
 SRCREV_pn-gabriel-native ?= "38"
@@ -93,15 +82,11 @@ SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
-SRCREV_pn-libeflvala ?= "676c901eb57f653231fb4c9eeabc2ed3d1b0c072"
 SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsm0710 ?= "50079c58e6f4a21edd6ab33ef2365abb1f5441d2"
-SRCREV_pn-libgsm0710mux ?= "114044266a094c61a2c25ee5a823635ae50a4e89"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana = "749"
@@ -135,8 +120,6 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-matchbox-terminal ?= "1612"
-SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
@@ -218,13 +201,11 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4907"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
-SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
-SRCREV_pn-python-pyrtc ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-python-pyyaml ?= "344"
 QEMUSRCREV ?= "4242"
 SRCREV_pn-tslib ?= "77"
@@ -252,9 +233,6 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 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 ?= "45825"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
@@ -262,7 +240,6 @@ SRCREV_pn-wmiconfig ?= "5394"
 SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
-SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
@@ -337,3 +314,5 @@ SRCREV_pn-rage ?= "${EFL_SRCREV}"
 SRCREV_pn-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
 SRCREV_pn-waker ?= "${EFL_SRCREV}"
+
+require conf/distro/include/sane-srcrevs-fso.inc
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index dff4b9f081..72fff9869d 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -24,7 +24,7 @@ PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 PREFERRED_GCC_VERSION_xilinx-ml403   ?= "4.1.1"
 
 # This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
 
 # 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"