summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/amend-recipes.inc29
-rw-r--r--conf/checksums.ini460
-rw-r--r--conf/compatibility-providers.conf3
-rw-r--r--conf/distro/corecdp.conf43
-rw-r--r--conf/distro/include/fso-autorev.inc1
-rw-r--r--conf/distro/include/kaeilos-2009-preferred-versions.inc37
-rw-r--r--conf/distro/include/preferred-shr-versions.inc11
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4.inc13
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.5.inc3
-rw-r--r--conf/distro/include/sane-srcrevs-fso.inc34
-rw-r--r--conf/distro/include/sane-srcrevs.inc29
-rw-r--r--conf/distro/include/sane-toolchain.inc2
-rw-r--r--conf/distro/jlime-2010.1.conf (renamed from conf/distro/jlime-2009.1.conf)21
-rw-r--r--conf/distro/jlime-donkey.conf139
-rw-r--r--conf/distro/jlime-henchman.conf104
-rw-r--r--conf/distro/jlime-mongo.conf105
-rw-r--r--conf/distro/jlime-shrek.conf54
-rw-r--r--conf/distro/kaeilos.conf96
-rw-r--r--conf/distro/minimal.conf11
-rw-r--r--conf/distro/sharprom-compatible.conf1
-rw-r--r--conf/distro/shr.conf6
-rw-r--r--conf/local.conf.sample6
-rw-r--r--conf/machine/akita.conf4
-rw-r--r--conf/machine/at91sam9g45ek.conf29
-rw-r--r--conf/machine/ben-nanonote.conf5
-rw-r--r--conf/machine/bug.conf8
-rw-r--r--conf/machine/c7x0.conf2
-rw-r--r--conf/machine/collie.conf2
-rw-r--r--conf/machine/dm365-evm.conf2
-rw-r--r--conf/machine/include/AT91-LCD.inc15
-rw-r--r--conf/machine/include/AT91.inc51
-rw-r--r--conf/machine/include/davinci.inc2
-rw-r--r--conf/machine/include/kirkwood.inc2
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--conf/machine/include/zaurus-2.6.inc19
-rw-r--r--conf/machine/jornada6xx.conf13
-rw-r--r--conf/machine/mtcdp-embedded.conf29
-rw-r--r--conf/machine/mtcdp.conf29
-rw-r--r--conf/machine/om-gta02.conf6
-rw-r--r--conf/machine/qemumips.conf4
-rw-r--r--conf/machine/spitz.conf4
41 files changed, 759 insertions, 677 deletions
diff --git a/conf/amend-recipes.inc b/conf/amend-recipes.inc
new file mode 100644
index 0000000000..bcb93d4e75
--- /dev/null
+++ b/conf/amend-recipes.inc
@@ -0,0 +1,29 @@
+# Allows tweaks to be amended to a recipe via a .inc in its FILESPATH
+#
+# Simply drop amend.inc into an appropriate place in a recipe's FILESPATH and
+# it'll be parsed in after the recipe itself is.
+#
+# Copyright (c) 2009 MontaVista Software, Inc. All rights reserved.
+#
+# Released under the MIT license (see LICENSE.MIT for the terms)
+
+python () {
+ import bb, os
+
+ filespath = d.getVar("FILESPATH", 1).split(":")
+ amendfiles = [os.path.join(fpath, "amend.inc")
+ for fpath in filespath]
+
+ # Adding all amend.incs that can exist to the __depends, to ensure that
+ # creating one of them invalidates the bitbake cache. Note that it
+ # requires a fix in bitbake. Without the bitbake fix, the cache will be
+ # completely invalidated on every bitbake execution.
+ depends = d.getVar("__depends", 0) or []
+ d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)])
+
+ existing = (file for file in amendfiles if os.path.exists(file))
+ try:
+ bb.parse.handle(existing.next(), d, 1)
+ except StopIteration:
+ pass
+}
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 01eb9dad8c..d78264d553 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1138,6 +1138,10 @@ sha256=6a3ef9f5556a3d75832b2b9138bdf3551dc59994d2849307f88a9dcd9732d16c
md5=a7ab98ad530fdc59a23f7dff502db8d3
sha256=d08d8477ff1c6639bc7193b76a415f996c98604600e9fa4e718fd4e9283f83f4
+[http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.10.tar.gz]
+md5=6c06584b31559e2b59f2b982d0d1f628
+sha256=75e05d1e95f6277b44797157d9e25a908ba8d08a393216ffb019b0d74de11876
+
[http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.3.tar.gz]
md5=d55826ffbd2bdc48b09cc64a9ed9e59e
sha256=2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69
@@ -1182,6 +1186,10 @@ sha256=ac6f511404457592b88fd57c4c77f7feba8e3b55d62c3c45c117fe84f1e07a7d
md5=29d12d1b883bf834c291c93f52ba8dc5
sha256=7e2e7b46088a7b9594b255b58123598d49c5c3d11bcc3c9a8f80969cd9caa6c5
+[http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz]
+md5=6dd5a85e4924689a35a5fb1cb3336156
+sha256=b4248876798b43d0fae1931cf8ae249f4f67a87736f97183f035f34aab554653
+
[http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-1.03ii.tar.gz]
md5=5bcb197fd42e67d51c739b1414d514a7
sha256=f06895c0206dada9f9e7f07ecaeb6a3651fd648f4820f49c1f76bfeaec2f2913
@@ -1314,11 +1322,11 @@ sha256=2c55c84684a05934d5421707d76c1b6f5f45618a818a10d8dcf607027d93065e
md5=f0ef2cea8acfbcc58d865c05b0c7e1ff
sha256=8c4c70bf487f2e432046dce07cf4b77ff181667d0905f9cb1203ff95ff5dd5ff
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/Terminal-0.2.12.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/Terminal-0.2.12.tar.bz2]
md5=adb419d279c9fc16d02291c052190717
sha256=352205b03e9ed1b9080c61235fbc0fa15609410e724237441055a232a3b603dc
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-0.2.8.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/Terminal-0.2.8.tar.bz2]
md5=cfe660ecf50e9d3b073576bbc4af6ab2
sha256=20a58b96915f67c5b4f49fb1428e1876195f1f9fd7d37e0081352cadc13463e7
@@ -1350,11 +1358,11 @@ sha256=b72813be2639d49dda2a3f87928b7ce185633f3afaa25300afbfb844b12deea4
md5=4931662ea353384dec2a54a71b26ee8c
sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-0.9.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/Thunar-0.9.0.tar.bz2]
md5=0fc5008858661c0abd0399acbe30ef28
sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2]
md5=218373aa45d74b6ba8c69c4d5af3bb19
sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
@@ -1630,6 +1638,10 @@ sha256=68b1d0acd1a6e17d91412635cd4f65ba58d293e62a01475a43f3712c49a46e7d
md5=03e5e7ab8ac3acc59661c6e9c09089b7
sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
+[http://downloads.vdm-design.de/aceofpenguins-launcher-0.3.tar.gz]
+md5=2fe7dcdbbdbf3b2821f627e02c406caa
+sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839
+
[http://downloads.vdm-design.de/aceofpenguins-launcher-0.4.tar.gz]
md5=40f19a26cbfa35de8346efe582b5d984
sha256=ea09581b3a31e3409968876461da3e384dcb0000abbb0060ae14e4fccb4994e1
@@ -2310,6 +2322,10 @@ sha256=09ef85da45a086c27b6a43a457f81bf44913e7fa2e854e72281aa3c25c00874b
md5=769bd07e6ae825d51b0d78e31ffcd87d
sha256=c97f2328cfa89934b08dd226af3f645f7af0f7593c4b034e0b8c810b29d3f316
+[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.13.tar.bz2]
+md5=1f539d6db38111b6a1d7ab93eb0a648b
+sha256=93b01b723ed69f33316384f097da864f5d49c40520c87ccf5537518dbff9df86
+
[ftp://www.at91.com/pub/buildroot/at91bootstrap-2.3.tar.bz2]
md5=a29b3f07e623d20894ab23335daf5da5
sha256=d598d078c24a24b13eac8a219a4ab05499909404cbd4efcb8641fdcde28464c0
@@ -2522,6 +2538,10 @@ sha256=c38ac9fe53d9492b0a0a02a8e691cd2c96d7f4cc13aedeedc6d08613b77e640f
md5=0e2e0f757f9e1e89b66033905860fded
sha256=2efebda5dd64fd52599a19564041d63dcaba68fafacc0080ffa6e8f0df8da697
+[ftp://ftp.gnu.org/gnu/automake/automake-1.11.1.tar.bz2]
+md5=c2972c4d9b3e29c03d5f2af86249876f
+sha256=5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae
+
[ftp://ftp.gnu.org/gnu/automake/automake-1.7.7.tar.bz2]
md5=4323c25644ed092c3d4fdfef434ab28d
sha256=d2c98fb12188461b0542bd928e91c3767db2cb6cd951a222b6c305bd99a75878
@@ -3710,6 +3730,10 @@ sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
md5=dfb197b8de260ff284f7222ed23614fe
sha256=b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163
+[http://www.busybox.net/downloads/busybox-1.15.3.tar.gz]
+md5=f24d830f292d1ad27910ef226d6b2ef8
+sha256=dd8e07708d380a44cddaccce731c0e39f4d47ad921ab886644b6258fdf80b590
+
[http://www.busybox.net/downloads/busybox-1.2.0.tar.gz]
md5=6af69ebbbf8adc874ccb6d67dca95df5
sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0
@@ -3958,6 +3982,10 @@ sha256=9c86a5668a2834f02ec44967737d6341c575e2a1deec76944f47be0292a3cfd7
md5=0ce88fc52025b44812d090d10244b2a4
sha256=9c86a5668a2834f02ec44967737d6341c575e2a1deec76944f47be0292a3cfd7
+[http://downloads.sourceforge.net/cbrpager/cbrpager-0.9.20.tar.gz]
+md5=e1aee9221ec69ca8cc3a55093095ecf3
+sha256=8838c53c49d2982c4d716ff5f241cf7168d5c4c5888cd73db21e73402dd5db39
+
[http://samba.org/ftp/ccache/ccache-2.4.tar.gz]
md5=73c1ed1e767c1752dd0f548ec1e66ce7
sha256=435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
@@ -4762,6 +4790,10 @@ sha256=c64eb1923366934357c917ff9a94237a8157de24a1fd96e0f91c4d5dfad83026
md5=d06dcf3e3b2f8eb25216431ec055aa4b
sha256=c64eb1923366934357c917ff9a94237a8157de24a1fd96e0f91c4d5dfad83026
+[http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-006.tar.bz2]
+md5=124b0de8f3a4d672539a85ce13eed869
+sha256=b8e77854a1400b0cc73295f3ee5d0a0c3650438e677526a199e08f6680c15aa1
+
[http://www8.in.tum.de/~schneifa/group/sources/cpusage-0.1.tar.gz]
md5=f779140995280de32817ec4a133f4d60
sha256=feb0b8c73c771390a8771fc3a4ed01104c008bcd278a267eb00263794956778c
@@ -5534,6 +5566,10 @@ sha256=47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
md5=bb9999cabeb4db3d915687de465dbeb0
sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
+[http://www.dillo.org/download/dillo-2.1.1.tar.bz2]
+md5=93f674f2a42d90a1cdb88a6972325954
+sha256=8eec025872030fc1419fb93ee41dbdf380a6d1f75f4d51aec5eee9a9a4aa4477
+
[http://dircproxy.securiweb.net/pub/1.1/dircproxy-1.1.0.tar.gz]
md5=066bd39d80f286ae5ce69a2adbbd01e4
sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
@@ -5610,7 +5646,7 @@ sha256=531b957d9589950a96cbdbf6a8376f31203797948baed311553cc2d2870c78db
md5=02aa4ffb835cbc9bdf96fcb915901cb3
sha256=2dac596d5150174d0a2d9170db698c1d72584a8ab3b5eedf907086f53f76cc87
-[http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.15.tar.gz]
+[http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-2.15.tar.gz]
md5=72f59fa070a1dc7f664603b20134c383
sha256=9aec45b395b6206e8eb85417f58186cdd0a307ed0f26f4b73af7031023a52225
@@ -5918,6 +5954,10 @@ sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
md5=e218df6c84fc17c1126d31de9472a76c
sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.9.tar.gz]
+md5=52f60a9e19a02f142f5546f1b5681927
+sha256=cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
+
[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
md5=c7545bb05e0c2fc59174f0dc455c6519
sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
@@ -6230,6 +6270,10 @@ sha256=5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9
md5=1edc492c0fd339dc30f0a443adad5fbe
sha256=bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7
+[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.28/empathy-2.28.2.tar.bz2]
+md5=8d578d82d1e51dc8c83642b81c0fb65a
+sha256=8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
+
[http://download.berlios.de/emul/emul-1.0.5.tar.gz]
md5=f713b4d3c6a733b429de2673e4427483
sha256=b91c7fb6420f6787d34b88b1e0d2e705e1006b5bce17235356f84a3c14329612
@@ -6294,6 +6338,10 @@ sha256=45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
md5=b789d09fa76e76a6466a786f0628d0ff
sha256=789846f0a3df54b03a07cd117ee59b53f63a8677662cb2ff754a9be94032ec44
+[http://ftp.gnome.org/pub/GNOME/sources/eog/2.28/eog-2.28.2.tar.bz2]
+md5=ee5fd7f3cdd37467cb86052a858757c3
+sha256=9d7ec3f8a94f5fdc051d9ee5dc5f4f8e46d83b44d9b0a40d68beaaa738a91a08
+
[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.2.tar.bz2]
md5=a7d4a62ad148182944ad60f7a3647cba
sha256=baa8c7f981b3fb9c72a4cf7194c2fa6a3b7aa039f2a266b8ccdf74aec931cbc3
@@ -6574,7 +6622,7 @@ sha256=53082354ae893fd385051c96214640cbeba527131ccf9f5320626252a4aef8d5
md5=eb8b6d834d2224e17561593dc4158e4d
sha256=418c3b9e099b96f7b8e1456c34b585b2f4bd10af88fb976116a154e4cb54fa9b
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/exo-0.3.101.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/exo-0.3.101.tar.bz2]
md5=1c0eebb360f53eab70454b70e1bde36e
sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
@@ -6582,7 +6630,7 @@ sha256=0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
md5=ba87f84894498bf23ae39d849c55f98c
sha256=278f702d890c89bd3923ce1bdaf29bd9f2c800c2e4cfd9e902d99663bba337e5
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/exo-0.3.4.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/exo-0.3.4.tar.bz2]
md5=7a1af943b1df32b6f89ae91823118a22
sha256=a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538
@@ -6994,39 +7042,39 @@ sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0
md5=351cc4adb07d54877fa15f75fb77d39f
sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
md5=5704a8c36de84b408e069afb0c5bc1df
sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.6/source/firefox-1.5.0.6-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.6/source/firefox-1.5.0.6-source.tar.bz2]
md5=3a659d384744cab77f90920f6d529c89
sha256=79e47279d839914e5052e1b1f21588c51d7f62c3f5e32205f790a60cafdbb5ac
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/source/firefox-2.0-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0/source/firefox-2.0-source.tar.bz2]
md5=03709c15cba0e0375ff5336d538f77e7
sha256=dba581583ef390fab90c39c9a667bf1a5bfbeaec75e6fbb2a9cedcc857d26800
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.1/source/firefox-2.0.0.1-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.1/source/firefox-2.0.0.1-source.tar.bz2]
md5=7a1fc804ed735c5b7e9b1498bac8b5db
sha256=b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/source/firefox-2.0.0.3-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/source/firefox-2.0.0.3-source.tar.bz2]
md5=24398e3d98673a2a92a01a8f771ca12a
sha256=02169e4e7a095c426fd5caf56c6cfc2415f4fe54cef7f4e78556f350e2c94007
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0/source/firefox-3.0-source.tar.bz2]
md5=4210ae0801df2eb498408533010d97c1
sha256=606e84ac02322aff692b9d4612cb8e27f5fa0da29e14bce7744927e0dad9c4b9
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.1/source/firefox-3.0.1-source.tar.bz2]
md5=406d67174f8f74ab154a1b17d0881b27
sha256=e16c9794b624188a85af52a2f61131189f422cb99c7fb9777686741cb330dc33
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.4/source/firefox-3.0.4-source.tar.bz2]
md5=8a1ac4a5940108a96458c5307a74c98d
sha256=685df7c7f33fc71a8c2d0fb71e190d59e2dd92007c2ace1ad176e655fb3012d7
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.0.8/source/firefox-3.0.8-source.tar.bz2]
md5=5fb6c6f3e973516df83a573348377a2f
sha256=e0c279546d99d3d21c30cdae6649e0d3710a5db44edd1347b4f31e04cb729040
@@ -7046,15 +7094,15 @@ sha256=5382518ad10313c4c22fbfd2bf5cbf1a6e88160e7e29ab5dcd07362147d04c8d
md5=c315e06cdfe9ee76aa4831ece1ed5df3
sha256=402ca3641f1724f5a4ec1ac3e283cd1334bd85c4b5de7744bd267454ef31259e
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.2/source/firefox-3.5.2-source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.2/source/firefox-3.5.2-source.tar.bz2]
md5=136867f95c86f3988b7f825e874b85de
sha256=d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
-[http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2]
+[ftp://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/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2]
+[ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.5.5/source/firefox-3.5.5.source.tar.bz2]
md5=b3d92dfb40584141dc1068efc9bdfccc
sha256=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb
@@ -7154,6 +7202,10 @@ sha256=84fa995c461066ed39c587c834414ef1a320f605b6b6e1db2d10d12fa6a587db
md5=2dfdb9b44a1a08a675985bb92d1439e6
sha256=4a0d868889d5221cc6e4b96f6e8de19bd4fc770fa8e05012c6c169686088088b
+[ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2]
+md5=a1765594bc427ff892e36089fe1fa672
+sha256=37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a
+
[ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-1.1.4-device.tar.gz]
md5=826c6afa88c9c4da734fe7393ed59639
sha256=a0e31ad5088414aaee003586a23127a5ace7717ba4f8fb4e02cf56bb9a5c30f4
@@ -8066,6 +8118,10 @@ sha256=fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
md5=4879f06570d2225667534c37fea04213
sha256=c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
+[http://downloads.sourceforge.net/fuse/fuse-2.8.1.tar.gz]
+md5=0e3505ce90155983f1bc995eb2cf6fa7
+sha256=007f1056ce329a7c9976ab7b68d3361991261e188f36364d0406f8ee457d2eaf
+
[http://downloads.sourceforge.net/fuse/fuse-python-0.2.tar.gz]
md5=68be744e71a42cd8a92905a49f346278
sha256=89f3e9ac096759e10b6292632216c9653d7e35c2c99847267173d94afdf85b92
@@ -8526,6 +8582,10 @@ sha256=b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4
md5=917dc80f5ef6adcdc15193de238476db
sha256=da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
+[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.2.tar.bz2]
+md5=9607c6bac31c9d8bd3446e66a4576c2e
+sha256=0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
+
[http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2]
md5=c6c22c7f9feff81a15f5c8ece03b87c1
sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
@@ -8722,6 +8782,10 @@ sha256=71e285da2f8f03dd0c6f6a969d1f541ab2a2f1a9d91e26f6f60779897d68824e
md5=9a34b924ea10ce0a1d62441ee2bacfff
sha256=80db72ac16463ce084e76dc9aaae5b54ce8db085610c98fe2975c5b8f51a598d
+[ftp://ftp-fourier.ujf-grenoble.fr/xcas/giac-0.8.4.tar.gz]
+md5=c0bdb493cfef3dd058cc3750101a4f47
+sha256=354923541221670d48ea2d713abd3fcad94e7f0d220ac9d53e9bcee0eda6ed4a
+
[http://linuxbrit.co.uk/downloads/giblib-1.2.3.tar.gz]
md5=06ae3113fdfe9f05a642bd844cc85eab
sha256=42eb6bff68e88ef12a7ac2aa69848aeb29a8b69176b3bd3d9d67cf9a1233fe85
@@ -8810,6 +8874,10 @@ sha256=f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8
md5=39c30867511b79391eb9177c86c8b79a
sha256=08e4d272471d377cd7c6cac6a6089a540436961c00ddd09de4f29a3148ec71ef
+[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.8.tar.bz2]
+md5=a4d9462c9420954824a80c9b1963f9d9
+sha256=d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
+
[http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2]
md5=0a8474e0d90b139b1baa70b097a4fd51
sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436
@@ -9230,6 +9298,10 @@ sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
md5=78fe56143bab9a7df232fa15e35a54a6
sha256=972da0f1c35df459b99b24f5bbed5ddec150b714540e2254b6b37035117167ed
+[http://glista.googlecode.com/files/glista-0.4.tar.gz]
+md5=db4afe3ba157232a6debe58885c693e6
+sha256=39289c0fc3efd3b003730212201ce7d8a56b06fcf080188ecc76d4ad9375c807
+
[http://camaya.net/download/gloox-0.8.1.tar.bz2]
md5=9054d072f5972d5e567c428531734ad5
sha256=7f836c8189b55ef4ec8f3387673687d0a5c1a713abc9617144638b28e6857bd2
@@ -9498,10 +9570,18 @@ sha256=19b5b4425bc578af8a1c58b61f1b9a416743d0b1fae3356cd9a0071f1f66632c
md5=5934c08d12407d8233416343cd73df24
sha256=6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.19/gnome-doc-utils-0.19.2.tar.bz2]
+md5=e2509ab1a7719902cf544cb288df438d
+sha256=ee5798361e4396269820aa7571bcf173e77c454ed2b1a38b9fc1dcbd7f58abae
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.7/gnome-doc-utils-0.7.1.tar.bz2]
md5=21fe881ab473fdc9246c36bd8ef929b0
sha256=5b51e0dfae64e7f48883fce6657fcf47a03f6429e2c67024203e31cc29032a22
+[http://launchpad.net/gnome-dvb-daemon/trunk/0.1.14/+download/gnome-dvb-daemon-0.1.14.tar.bz2]
+md5=f7a840620f10e5ecf86516c5cb721eb2
+sha256=fc8d5d3918cae739d86718b6e9124dae2ca5ea033a7d3b4e71fc16b2b6463288
+
[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.23/gnome-games-2.23.6.tar.bz2]
md5=9f13ed34427d4c19d423464cd59dba08
sha256=af2ebf32fe93817e06333b94d3fabcf72fa5675f402c1bbdb7bed3be0b3b3a3e
@@ -10002,6 +10082,10 @@ sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
md5=c48a89bfceeb604f163aa55540088021
sha256=0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd
+[http://downloads.sourceforge.net/grecipe-manager/gourmet-0.15.2.tar.gz]
+md5=d18be0dd5faf7249f657c4cc87105c31
+sha256=d1130c71a876f333707aa8dd8b9689a0aaf115e782ec4a033359eb2995942848
+
[http://downloads.sourceforge.net/gparted/gparted-0.3.3.tar.bz2]
md5=f3d16ccfda72fa1dac9fa1ff9ded2c42
sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
@@ -11106,6 +11190,10 @@ sha256=d9e056793d05bf0b6f4989b27d3107c2f223a14205ee54be403bbe52945c8853
md5=f3c32e0bc3ec1be461ce43e407a6a67f
sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5
+[http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-0.10.23.tar.bz2]
+md5=dd1923a4b3c397b16286bc7a903f5e75
+sha256=e8da54a2cc35e6cc4876cb64b00b20e9b7058806ff1ff7f4da002b14f4652b4f
+
[http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-0.10.7.tar.bz2]
md5=ee93b63fb9a7a3081c3d68fdd83949be
sha256=8e6e078161d9cc020ac9a403c3e7c0f124684c994d66b01895b147bf618bdc13
@@ -11302,6 +11390,10 @@ sha256=f1aeb28d27ea4078467125e7eb5ee2b16b08443c9f5f3aa1010d262c37aacc0b
md5=8daaca1299aeb42c6aac47b30291005b
sha256=1ebf3571d16dbab401f2ebf0362e3d67457fb88711ad15a4ab51bd3730267fb7
+[http://people.freedesktop.org/~wtay/gst-rtsp-0.10.5.tar.bz2]
+md5=caca55e2ff497c0a327df3bc65a4a662
+sha256=a6f0a0c6c466683ee688aa8475623850fdacb549b2339a502831fdd3d74f984e
+
[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.11.tar.bz2]
md5=67240094e08c845b7bbcfba755c95695
sha256=d7130fbcbcac945c28402361b60e8d24d97f75d795ba91401617f81e595a7dd5
@@ -11530,7 +11622,7 @@ sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
md5=7b4aebf85040b357124de926807dc22a
sha256=cb2b353839a7f1dcd8f93a6cb32b5c54a6fe560dee432585edb2f5eebe526c50
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/gtk-xfce-engine-2.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/gtk-xfce-engine-2.4.2.tar.bz2]
md5=00eb6a62defe6867d28a18569b96d151
sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78
@@ -11538,7 +11630,7 @@ sha256=6fecdb590fa024db698de9027314c1be044f28feab9850f592aa60c3a79ede78
md5=e836705d2933d0a77c6628285e10d982
sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/gtk-xfce-engine-2.6.0.tar.bz2]
md5=e836705d2933d0a77c6628285e10d982
sha256=c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
@@ -11858,6 +11950,10 @@ sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0
md5=ae7177ab8f0163d3ef2df71f0de2b357
sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f
+[http://downloads.sourceforge.net/hamlib/hamlib-1.2.10.tar.gz]
+md5=29f0d30779a8ffe0444eb523a6ad8344
+sha256=9b50825666519b0b86469f1988a0de09ce2ffc08fa221f9aa40d18c7b7f6c651
+
[http://downloads.sourceforge.net/hamlib/hamlib-1.2.8.tar.gz]
md5=74eaf1be4cf1cbdecee54808c6930788
sha256=be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81
@@ -12298,6 +12394,10 @@ sha256=3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf
md5=e80a6739ead9a260087fe4d3fc6a8359
sha256=9f90613de73e1b8e90d9bbcb09046e83680f15a46fc630c3e26e9aa4ca0e6a1d
+[https://launchpad.net/ubuntu/lucid/+source/human-icon-theme/0.35/+files/human-icon-theme_0.35.tar.gz]
+md5=dd9bad3b7f95619a6536932300fe202a
+sha256=d234a562fc4af10982b138b3e67e7f61f44b572d0493c776e639508e4faa0a29
+
[http://downloads.sourceforge.net/hunkyfonts/hunkyfonts-0.3.0.tar.bz2]
md5=36444795a356fb8a56c63b2840729bab
sha256=e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829
@@ -12978,11 +13078,11 @@ sha256=09a30fa12d81014b2877e8b5c36f5a341788579669d72f2dec0e29d22efe11e9
md5=2ff18f0571b5a331be7cd22fc3decd41
sha256=09a30fa12d81014b2877e8b5c36f5a341788579669d72f2dec0e29d22efe11e9
-[http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-0.11.0.tgz]
+[http://www.openzaurus.org/download/3.5.4/sources/irk-0.11.0.tgz]
md5=5b39a7fb06fd24edfb543a3a0130065c
sha256=5eeba81a5e5163e0b0b92b5e5aaf91c07b412a743a98f59975c75d28c133a85f
-[http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/irk-current.tgz]
+[http://www.openzaurus.org/download/3.5.4/sources/irk-current.tgz]
md5=a77eaea6930b9af5bbcd59bf9f8859c8
sha256=942240421710da8a04fa6c7071f50f0737ab7198e31c1d96f1e0b73330e0d066
@@ -13030,6 +13130,10 @@ sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
md5=ebef12559268e2c5ea932cbb5aaa789e
sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
+[http://wireless.kernel.org/download/iw/iw-0.9.18.tar.bz2]
+md5=9734080d8a5c4b768c5e0da665a48950
+sha256=b02e26efc72cb23129431e478dbb2f2abd16e8cc4f4130762d98c54f106aabd0
+
[http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2]
md5=e3013bb1e287b495b0668f4b6e2887c7
sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
@@ -14762,6 +14866,10 @@ sha256=f776abe417432b3c4ff8b063201c4b4b45479a563fb43e6fd64504b538ef4689
md5=181f063344a0e674e5c2546544d5e27f
sha256=b0159537f22453fcf30d7c4d7d9a39b6996233217c1f80a49ede135cf6ed32ca
+[http://libdlna.geexbox.org/releases/libdlna-0.2.3.tar.bz2]
+md5=2c974f95b711e5fd07f78fc4ebfcca66
+sha256=8eb7941cbae088026dd394fbe6f465cae6dd848edc430c6313f04cf57d1192b4
+
[http://downloads.sourceforge.net/libdmtx/libdmtx-0.5.2.tar.gz]
md5=129d960e30498f2a68d31c2c40b145af
sha256=bd9669e5f1a43d1cfcff4d3dc5f18736ba7c950c8ba7b71b1d9cf4436a3783b3
@@ -15674,6 +15782,10 @@ sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
md5=7ee7d8c834f1e06093130a86cbb9e79a
sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
+[http://launchpad.net/liblauncher/0.1/0.1.8/+download/liblauncher-0.1.8.tar.gz]
+md5=b220357aaccc581c05337d05c5a1356f
+sha256=e2d7c0eb9702e83e28551b89e3cbc283c6835e42c8336bd251c3b5c50dfdc9e5
+
[http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.0.1.tar.bz2]
md5=b73cbd5bc3cd268722a624a5f1318fde
sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258
@@ -15818,6 +15930,10 @@ sha256=c80da366576501be18a987c28609bd8ffa340ed20fc03249c70c43634f077052
md5=091bd1168a524a4f36fc61f95209e7e4
sha256=84890249b3ecf12ef040b9121b6238248fc8da0fee948661d70375049e5131ee
+[http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.7.tar.gz]
+md5=d2d9ccd8da22412999caed076140f786
+sha256=3cfdebb60833a082e2f2b8faa3892bc9201d05c64051503e8007d8c98ae9e4c2
+
[http://downloads.sourceforge.net/modplug-xmms/libmodplug-0.8.tar.gz]
md5=cea399626e2a074e2a77c8cd98387a48
sha256=ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
@@ -16298,6 +16414,10 @@ sha256=cafe6431f9e6d561fb7b396bf94ff73a9cd0f4279f3eea2fc714ab90e345eee6
md5=29bbd1c3cbe54b04bfc2bda43067ccb5
sha256=a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
+[http://downloads.sourceforge.net/libpng/libpng-1.2.41.tar.bz2]
+md5=2faa7f8d81e6a35beb991cb75edbf056
+sha256=a172c5afe4668a31eb090d14be7fc2811a9fec8568a785badd30280f47a27e00
+
[http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
md5=00cea4539bea4bd34cbf8b82ff9589cd
sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
@@ -16942,6 +17062,10 @@ sha256=ea7945a131b67d4cf6bd02e41b0008d6aa1575d1aed75a0019d3c63cb61d07ea
md5=860cd0ddce03c41a328e580d4efd4654
sha256=8cf49cf1d882ceb0b7b3a984ec350e5e2e4d608fec97911a0b0acf36a18d4df4
+[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.28/libwnck-2.28.0.tar.bz2]
+md5=a9311661aa954e7c918439b6dd578792
+sha256=d90be36d2fefa33a9287ed6dc41141213a06463f91d69d847da6b2e59c16b947
+
[http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.8/libwnck-2.8.1.tar.bz2]
md5=c0a5a8478064287e167c15e3ec0e82a1
sha256=e9d15538a0bb97f6a440b23a5b372c41387773065dac69cab9fd1dc1d22a432b
@@ -16994,15 +17118,15 @@ sha256=824fed10aea3bfb3504b0c5f4e3a5208ae795e88f64730a5b07d5f5de3e771a8
md5=0eb951fd0fa9542dbe4fc3530b81a3b6
sha256=19d6b2ac380fd3e613a3730e791f197f186f940bffec97f8a4f9443bb727d11d
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4mcs-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfce4mcs-4.2.2.tar.gz]
md5=06c3d8ea6826d9a2fbcc1da6b86f1361
sha256=95b84b2b109f20e0fa6e2489dda55c5931a438ebfa21c8b4238350b0abdd0a6f
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfce4mcs-4.3.99.2.tar.bz2]
md5=7ee4eab238e773b9dbf3fa1472643f6e
sha256=8f3cd90d4ea258ffa35b8723c1eae7ace31409baa85361889664084c6c5d1b6d
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfce4mcs-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfce4mcs-4.4.2.tar.bz2]
md5=5ffe66a3eeb884839806ce929e5d2776
sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e
@@ -17010,19 +17134,19 @@ sha256=192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e
md5=5dc9343885c2c6f931318b2a1cdcc9db
sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4menu-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfce4menu-4.6.1.tar.bz2]
md5=5dc9343885c2c6f931318b2a1cdcc9db
sha256=5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfce4util-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfce4util-4.2.2.tar.gz]
md5=5f27635aa0ba5e40ffaf3031b530b36b
sha256=8efb3416a37654050089234115fe7db9268c8da0ee0369ff3f5330cef3f15a66
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfce4util-4.3.99.2.tar.bz2]
md5=4b327c64c292b2e672f69a0789deb2b7
sha256=988efce9b4fd7252475234be3ca3fe8b737125ebaadc8c448d1c5d4cbc8bb521
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfce4util-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfce4util-4.4.2.tar.bz2]
md5=261e7a5df039493ad746e0c359211092
sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d
@@ -17030,23 +17154,23 @@ sha256=f717dcdb4d8ee8f967ed0882e82aad06abe66c32481b9954737273312c937a6d
md5=eac51d58179cbcadc3f802450a8ec9cd
sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfce4util-4.6.1.tar.bz2]
md5=eac51d58179cbcadc3f802450a8ec9cd
sha256=ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/libxfcegui4-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/libxfcegui4-4.2.2.tar.gz]
md5=e88d6e8379eae60cee6dd6122bf3ae59
sha256=bdd542e60ffbe4987b5ae765e581fe5bcfdfc4d623341d09aaff7794e90d4454
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/libxfcegui4-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/libxfcegui4-4.2.3.tar.gz]
md5=5d2bae78c5ef66e914ae7a930bbdeb57
sha256=655c8c8657c16cf4fb9400722beb1a65841c0851e27a138c08b1908d5e254142
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/libxfcegui4-4.3.99.2.tar.bz2]
md5=98679c67ac65c376833deacec9fcbecf
sha256=a3da5f3b70e65d6679cfb21fd2baf10baedceb8b099347987f9b6c5fa7cd329b
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/libxfcegui4-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/libxfcegui4-4.4.2.tar.bz2]
md5=799a4869138c605126e8e71d58189bfd
sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
@@ -17054,7 +17178,7 @@ sha256=622c2585f61666d9c46841829ba141e86861c73bd9041a3a73452d1c8df5ee91
md5=539cff747634b8ee6f0d2362ee78a286
sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/libxfcegui4-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/libxfcegui4-4.6.1.tar.bz2]
md5=539cff747634b8ee6f0d2362ee78a286
sha256=3468a9cb348bf54f8a0afa386366683eff1987b722d2e81326f9e7ec7dfbe093
@@ -17198,6 +17322,10 @@ sha256=98f980e8971fa4d04a589215c3b90d2eaf317ed70fd0d4988089e0fe5808c853
md5=d775d6478391b95d841a1018c8db0b95
sha256=62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739
+[http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.18.tar.gz]
+md5=5db3204d57436a032f899ff9dbce793f
+sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
+
[http://www.lighttpd.net/download/lighttpd-1.4.18.tar.gz]
md5=5db3204d57436a032f899ff9dbce793f
sha256=97d0ac5957745eeaf311ec38ebbbf3b30a5316b01c320a759af47129c994c20c
@@ -17210,6 +17338,10 @@ sha256=197bd2b57c5e2b9bfc30bb565a4c44fbea82daa20a31fa8ba490dd61dad69f2a
md5=41dfad5c366d34d83c3d2b46d4c08f5c
sha256=8555db22ed7d429160701555611d8cd5eff42fc7e6e3ad3b050279c9b2145469
+[http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.25.tar.gz]
+md5=87e936ec272ddaba8a2fdfecd8c6b704
+sha256=0e71cd677a2282fff0ee0248a0e70a593a75e06f8a26411ca5314d0c01debbc3
+
[http://twibble.org/dist/sh4/src/lilosh/lilo-21.tar.gz]
md5=1e975d827ad96e1942df73f63512178e
sha256=da2340aca2eaf451243d2e4c2bf66aa4b80cc0abaef96860da8daf5db1cae12f
@@ -17382,6 +17514,10 @@ sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
md5=296a6d150d260144639c3664d127d174
sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz]
+md5=bc483723670bda09198d72293e712d42
+sha256=eae56a8a9c788518e88604fff343ce6139cecbc7e44356bf1ff4dc7aaf4e9b33
+
[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2]
md5=ca0ce8f288e8ae93ac243b568f906bf8
sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b
@@ -18422,6 +18558,10 @@ sha256=e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135
md5=14b3f971348f4d59ae8b8362d8eb15ff
sha256=272ac90813e4301873d46229b216622bb7bc6a0b3adb15577b20b5083f92a169
+[http://download.berlios.de/mapnik/mapnik-0.6.1.tar.bz2]
+md5=44093af694321ef2034b1fd2edc998c9
+sha256=59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
+
[http://www.maradns.org/download/1.0/maradns-1.0.39.tar.bz2]
md5=5ac39978f55ecaf6e887cd5be027b1c3
sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394
@@ -19250,7 +19390,7 @@ sha256=f1e187c61702a727bbd20bf5a66a310363257acc04b1f1c6e0b2e06e9b5dfa6e
md5=71e6bd13fcca70372e9b7c7806d62b30
sha256=48c456dfcadec2db472320e317fa37dc697f184e12f99006a1ec0b6512d2ebcd
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/mousepad-0.2.13.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/mousepad-0.2.13.tar.bz2]
md5=326075ac933e5da38cedbc20e80b7026
sha256=f32cc263fb73b05c5bad17121073a2b37a7d5c8e411f780312c2701902e6637a
@@ -19262,7 +19402,7 @@ sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
md5=d98854edb76d823ac20b266fdf5a64a1
sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/mousepad-0.2.16.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/mousepad-0.2.16.tar.bz2]
md5=d98854edb76d823ac20b266fdf5a64a1
sha256=86e593fd4b1b87d27cda9ebd8901078e795031b5880645850d6ef0b410f4e73e
@@ -19810,6 +19950,10 @@ sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
md5=b6e67a96e2f84bb70912da8c7e0d5ec1
sha256=e836560ffae454d4ca0c4cacd1f2a3e8528c5744372a77968bba3b947328ca38
+[http://launchpad.net/launch-lite-proj/trunk/alpha-0.2.0/+download/netbook-launcher-efl-0.2.0.0.tar.gz]
+md5=33088cb4a03b71082f2722b40cef11e0
+sha256=04e6f182f7d1421d06597c5b0909810b9db836a40763d92df0d1a6c798ccb61f
+
[http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
@@ -19826,6 +19970,10 @@ sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
md5=94441610c9b86ef45c4c6ec609444060
sha256=61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349
+[http://ftp.de.debian.org/debian/pool/main/n/netkit-ftp/netkit-ftp_0.17-19.diff.gz]
+md5=f7c82f2f78f26dcb869eca2ed633c464
+sha256=2168b592ce254ab6f6daf04b4eafb5607b664c48d85f74698a9376e2cc4503aa
+
[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rpc-0.17.tar.gz]
md5=67212720482ea1aea9182a98653a9642
sha256=421d63b414162237a72867061f1bd3e3752a0d962cd5d30b5e933ddad8a14d3b
@@ -20190,6 +20338,10 @@ sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
md5=2f03b81411a1f7c359ada35459d946a5
sha256=37fb4cffad7e361daffa9915ee6a37e615d0bf4d1f24760e585d5ac922515ca8
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.21.tar.gz]
+md5=3f2a7ae4ddca69001a23c034f8b28db6
+sha256=d29e9694e09fc2a504b84e6929768a90ac76ced5492e755d50c55c350df5bf31
+
[http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
md5=085b9edc0504c0d79e7479a54e2018c5
sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -20670,7 +20822,7 @@ sha256=1cb7c3968e3e01e7597f54b87ebc87a48c6c8e569db7e353adb91841db5b4190
md5=9d1e6a9bd4d6dc9cae3c54c18c303ace
sha256=e0e33fae512e54ff27474c926a758cf687e35d2c3007f69d4c647b69d47352ae
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/orage-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/orage-4.4.2.tar.bz2]
md5=0c69e4c20350c3000d49350991d3a520
sha256=ef08b96e5529f19a2f609525300fbea2019f1afb75fb3c85e474e6041f425abd
@@ -20682,7 +20834,7 @@ sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
md5=24fa43dd86ec5af5a4766620fd972cf2
sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/orage-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/orage-4.6.1.tar.bz2]
md5=24fa43dd86ec5af5a4766620fd972cf2
sha256=f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
@@ -20910,6 +21062,10 @@ sha256=1391df01a619c6df0049706fb7bd4c690c55439b7bee4d5e8c564525cefdede2
md5=e52d87fafbeed156354dff3c34203d3d
sha256=aec28206a8345f982a3e98b7b889721340899483e579a81aaf72c2cd59bb144e
+[http://downloads.sourceforge.net/owfs/owfs-2.7p28.tar.gz]
+md5=2d6a4311f7275eb04466e36678bacabe
+sha256=3b35a5c2d6fa0814d3c689dd490e829d3dd7729d09ae95f9205757cbb3ee52f0
+
[http://openzaurus.org/mirror/oz-compat_0.5.tar.gz]
md5=0005d4068b2227e26f4583c1a7415e97
sha256=8db9b3948c607315f0ba0df61b32f747bec5479c38051d3e0e55b31b82c81af5
@@ -21218,6 +21374,10 @@ sha256=b7cba2e38e81abb4d1d33c3f7f7c028310b392d5ee1ed5e3b2137e024598d903
md5=e786ab1f9c8ee97f054462811a89aaba
sha256=58007ec7430c5d954d2eccd64879797dfbcce68561c9de232cb59aca4fd2c1f4
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.19/patch-2.6.19-rc6.bz2]
+md5=e786ab1f9c8ee97f054462811a89aaba
+sha256=58007ec7430c5d954d2eccd64879797dfbcce68561c9de232cb59aca4fd2c1f4
+
[http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2]
md5=b220d8b8489003f3df03d897fbefa432
sha256=f85096df0acc179f676497e75b9ba8d9b8685b92b0b2b8b1d6871619ed879fbd
@@ -21798,6 +21958,10 @@ sha256=2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21
md5=a1bbb3c9be7d4ee1f53590d319cbfa72
sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6
+[http://downloads.sourceforge.net/pidgin/pidgin-2.6.4.tar.bz2]
+md5=6e1dc8b9dd6983a54ff3a6de33efa778
+sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11
+
[ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
md5=75af127948cc0c701d424d22d621f792
sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
@@ -21818,6 +21982,10 @@ sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
md5=5311ff9ddbca49ab751ad6f526c53e8f
sha256=540a363188a51387e5296fdb3f7b885f9a0a116d106d578c14e738075e7edf42
+[http://projects.openmoko.org/frs/download.php/907/pisi-src-0.4.7.tar.gz]
+md5=8d47a6a2926c635cb4eb633e3ee063ce
+sha256=fd4d89c138ef2d1a6f9458cb85363581a205d1c1b69578fe7e0f856668a7fe9a
+
[http://xorg.freedesktop.org/releases/individual/lib/pixman-0.10.0.tar.bz2]
md5=fb23e17a8a0308e8fad6dc153753ba9a
sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
@@ -21958,6 +22126,10 @@ sha256=ab6e33b09bfbd407ee444ef37d769658e651cfe6eee96ce7aac5be8860e069e5
md5=6619557b02559ac3191d4cc2054bf325
sha256=ab6e33b09bfbd407ee444ef37d769658e651cfe6eee96ce7aac5be8860e069e5
+[http://www.timwise.co.uk/src/podpooch-0.2.0.7.tar.gz]
+md5=e2e0045bf13e017bbaa5f5855475e516
+sha256=d978d3cb4ec99187309b906a636312827c8fef091df28ba9d7e07a5014017c0a
+
[http://www.apache.org/dist/jakarta/poi/release/src/poi-src-3.0-FINAL-20070503.tar.gz]
md5=1fb488c4061256197a667f1c480ffc33
sha256=48a5aabb873d4cc654c95acf6576868d7a8a3ee97e1c6418e1d716698b6efa76
@@ -23022,6 +23194,10 @@ sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37
md5=d6d2a16ccd1562b2ae63314f30a4ebf9
sha256=45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604
+[http://pypi.python.org/packages/source/p/pyrtm/pyrtm-0.2.tar.gz]
+md5=34423f39caf7df8a9db8e243be9cf1a0
+sha256=d9d46d096a38cb692b55f4ee9f364d54348298e9497b11c1ef057539b5de1567
+
[http://www.vanille.de/mirror/pyserial-2.0.tar.bz2]
md5=a8db6163466c21845faa6ef57af992da
sha256=df76084516b34b5e04dd84e54ef38613d87c56bc04de3d0a711f72fb6707ab0b
@@ -23306,23 +23482,23 @@ sha256=12b7f014e9ac0b650836ee9e54f58bd728c66591b7de94a9a8bd600bfb217622
md5=6e913e436a7b0f7572ec1ac77db41fde
sha256=ded3abdab8333aaf7f451963f32465ca1451a38afb173ef64e0f898d907a6e02
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freemono-1.0.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-freemono-1.0.tar.bz2]
md5=28688d47cd80d3a6bb833adb22292e15
sha256=5ac0513efe6270d45a2ada5dc653c434677da4282e026d8c1a9c156cd99e11c8
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freeserif-1.0.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-freeserif-1.0.tar.bz2]
md5=a7fa0210e02f42d5b14245e260bc72c3
sha256=c8ee6e5e62b0a182dbee85865e56b1572e6875769b8256b39c75b2334a283e45
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-helvetica.tar.bz2]
md5=20c040a004f4949b6849658148a78388
sha256=4b6a122b4f95cf90f9639ca423947e70bba4e567099f9baeada419a51b11924b
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-hunkysans-0.3.0-r4.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkysans-0.3.0-r4.tar.bz2]
md5=917d7f8f3ad3c5b94c747b37d0a5e74a
sha256=c3cdd8f234cbc1694af777dc1739ca4439cd472567d85f333dc11264d6bda7c8
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
md5=02b38aeaf30c17e15b714b9594ca504d
sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
@@ -23330,7 +23506,7 @@ sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
md5=92f6df1c5edb26351332df4f576dbb10
sha256=c1c5b5ab3431896502c9275daeb47610fb2a840faa6d580e140909a3f4ef7391
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-utopia.tar.bz2]
md5=fa2563f3c2332c5bcb05add075908f1e
sha256=599eed45edc9942f4b37858507c2223cb8decb13fea180cf33c6961ad48a33d1
@@ -23358,7 +23534,7 @@ sha256=99e73cec97c62fecaccc4a7f354392ea9964d8c20b0a4a330890c32dbac87732
md5=1f7ad30113afc500cab7f5b2f4dec0d7
sha256=883363eb0c94de3d1e36f3ab9e09a8f127418d497213cc1a0ed1a1588ecd66b8
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
+[http://www.openzaurus.org/download/3.5.4/sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
md5=fec42313fd5508d840240b5dd2fe27eb
sha256=0a706cf4c2a70dfeff2e886f225007844a4675f5c6387fb46c4b7f7ef327b68e
@@ -24122,6 +24298,10 @@ sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba
md5=f28c48e2caf79b8e9056636259056de7
sha256=67c58590430d04799644d164e4a5977356d95528864ea787356e35dd314e660f
+[http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-0.4.8.tar.bz2]
+md5=c3cbeb30141d9bcd13460ba5cc8acddc
+sha256=053c91b3e3f344c0eec614d38812bfdf3310b8bedaf614399322f614f71aca57
+
[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-dma.patch]
md5=4336cca098b577608813a7c1454f2edd
sha256=c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7
@@ -24322,6 +24502,10 @@ sha256=0b01f9fb9c869ecb6e066993d59e34789f82d445438480ac0e2dc30f29d047a0
md5=55596c41572c5efcf4b2cae9c68c2152
sha256=bbb73ebc3a22f53e75dfbaa1718eebcc5a3619bb200b50df42d5377b99ebf4d4
+[http://downloads.sourceforge.net/scim/scim-1.4.9.tar.gz]
+md5=975ba34b01304ea8166ac8ea27aa9e88
+sha256=f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0
+
[http://downloads.sourceforge.net/scons/scons-0.96.1.tar.gz]
md5=45b1c346edd8a0970210aeb1e82557c9
sha256=67ea186c1c6270178da0c3411f8c94fcb6a070eb68c3d43f08f282b0728d0c7d
@@ -25750,6 +25934,10 @@ sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0
md5=d7b8f27b83ff080ff824177d65a7dae0
sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649
+[http://pagesperso-orange.fr/sebastien.godard/sysstat-9.0.6.tar.gz]
+md5=c05ca01878a4069199d9af93cbe39c8e
+sha256=464a4e23ab3b7d6886a5b8aa108e05b1a7f42654e1c398a040c88c81f30168c9
+
[http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2]
md5=a77bde5adc5ee8822b0764ff786ccc09
sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224
@@ -25830,6 +26018,10 @@ sha256=e4f203a3370ef02684a320431cb71c28af3bc9084bd0af2d72889eb36a62da0d
md5=bf99c9510481681651434eb943fe3294
sha256=9f1e85c4f90a13ceb66dc8c0e6a92561fb00a8b01f63558b01ae9efdff984a59
+[http://www.tangogps.org/downloads/tangogps-0.99.2.tar.gz]
+md5=ba0b28f9f87f6b47cf32a4f2c935cc28
+sha256=269462ddae9b3837a8f44ae0004a3bbc2aa14feef7c9dfdc8eda55b2f39c0297
+
[http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
md5=e88c400394c092c2688bb2d490c80ccb
sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
@@ -25994,6 +26186,10 @@ sha256=49dca0428d69f43c856800967b2def8c890cd322fbdd0aa47c227aec5820a690
md5=ae67d4fe42c7e337813754cb5927b6cc
sha256=7bf25e050e8b8ceb983c1cad6b4e38892b052f6da82df3b7aec7b2ea50a8702e
+[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.37.tar.gz]
+md5=681b5b82fc3ec65d86a6cb409ec38e5d
+sha256=7ae86c8f17cb00e827a0bb60b03345984b3065a33db3d119527d41993a09443d
+
[http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz]
md5=21bfda9e1fa12e25b4173deb9ffd0b5d
sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82
@@ -26130,6 +26326,10 @@ sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
md5=d06e2dcef6ac6c975311e88083d8ef26
sha256=f30ffe64bcf4fc8a82a76594c254ce54c82a33d797cdc0f35f19519572f94c4a
+[http://stgt.berlios.de/releases/tgt-1.0.0.tar.bz2]
+md5=71f828ef455bdc0066ed087f9547530c
+sha256=0f0d82f50d12c41f1e277bb72e99bf86f02a4258d7595eb886ac554b09a67a33
+
[http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz]
md5=190f08ce6839aecb0fa0ce8d5ddd09ee
sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473
@@ -26166,10 +26366,6 @@ sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0
md5=5a085296b1147fe970a256a9b2d0f91f
sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/tickypip-levels_1.1.tar.bz2]
-md5=cfdaae67b3d33351e37021cb0394153c
-sha256=881109774a77e34c61fbf41a839fe02a95cb3e67a0218fe4aebc5e6999cbaa57
-
[http://www.openzaurus.org/download/3.5.4/sources/tickypip-levels_1.1.tar.bz2]
md5=cfdaae67b3d33351e37021cb0394153c
sha256=881109774a77e34c61fbf41a839fe02a95cb3e67a0218fe4aebc5e6999cbaa57
@@ -26278,6 +26474,10 @@ sha256=d158e56c43c978b6b2e5d3eed176357c6252ec5ec2ecd26c457fa9ae55fefc55
md5=9769f74c54b97b6fe53872e64137144f
sha256=66adcad8c8ce58c8fb01dbe8cff9ad39855a4d548ddc9405e70198671dae813e
+[http://downloads.sourceforge.net/tmsnc/tmsnc-0.3.2.tar.gz]
+md5=337dae91d4775e03b6681f61db56d2a7
+sha256=7f54ba3974f45c0787b6d62d0d62ce352ddbf95419123b98b4969b97d3dfed23
+
[http://tinymail.org/files/tmut/releases/v1.1/v1.1.0/tmut-1.1.0.tar.bz2]
md5=6178256c82efcd02b5d50f2289c13d9b
sha256=ac5dcd76faf25e0c40e91a4bcfea7f6f1bec33d361ad89a6e2f6fc63fa26590e
@@ -26362,6 +26562,10 @@ sha256=776ddf74b657da5709d8f3d1c800b8203aa82a5f06f1c6d2d0f23a0a5f6685f7
md5=42f071fcf8ffc471beb3e1689297d647
sha256=18121f17c37faaa9cc245d46293a24f58f2bba9dc9b84af5e1ffe0ac6e697b04
+[http://ftp.gnome.org/pub/GNOME/sources/totem/2.28/totem-2.28.5.tar.bz2]
+md5=03b43f3c3a93b6dbcf1d1b370cc9297f
+sha256=c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063
+
[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.23/totem-pl-parser-2.23.3.tar.bz2]
md5=c163dfd840c6a522e6cd852b379e89cd
sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75
@@ -26430,6 +26634,10 @@ sha256=b221d6ecec0c5ca9908f17ae7d56ce139d317faaa0c106e99fb321130280f151
md5=0b9cf68b68ce04d2e91723e3190c0568
sha256=6ffff2365e0508fd0e190054f2d57893b8755be8ce4a34e7ef89861c06033eb9
+[http://mirrors.m0k.org/transmission/files/transmission-1.80b4.tar.bz2]
+md5=8a257189b51bd3608a8478680230e716
+sha256=c7dc1627e21a5f1625ce4958e247a44fb8b13ce8733085c1d64707bd93ed9178
+
[http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
md5=3b713239e5e6b269b31cb665563358df
sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -26638,6 +26846,10 @@ sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
md5=3cd8038d7bbfb3a4ac544aceef724853
sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
+[http://gentoo.prz.rzeszow.pl/distfiles/tzdata2009s.tar.gz]
+md5=3cd8038d7bbfb3a4ac544aceef724853
+sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
+
[ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz]
md5=8b766bb807c1f7c0c02ff798ea5db80e
sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de
@@ -27210,6 +27422,10 @@ sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
md5=97e1497eed21ef0ac82514ead94c5ee4
sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
+[http://vagalume.igalia.com/files/source/vagalume_0.8.2.orig.tar.gz]
+md5=e25d41ea12eac9891663b2c32cb91851
+sha256=9d046572b1c8e2917f69df2abddf7199f643da1d0eee25aae828ad8891f67103
+
[http://download.gnome.org/sources/vala/0.1/vala-0.1.5.tar.bz2]
md5=4e082ecb7f60ebdc49f3bd19ae7ebca2
sha256=20c577c9130f114dda24fd5a1c19cd477679553c4e2e7c8362471ae1f21b6836
@@ -27302,6 +27518,26 @@ sha256=730d369e4ac17abf9f4073cd85873372ac6d98ad86fa2e91ea9f0b414c0479c1
md5=06336c53d12a864a5092e215ec5648f3
sha256=5f810c66d35ecea5f77ca6ed87fb3ba394c700dcbcaec5f04872a4c5340a5622
+[http://www.freesmartphone.org/sources/vala-0.7.9.3.tar.bz2]
+md5=22eb478f18a623a2983bd401a3de0683
+sha256=a074f50cf1ee3bb4118c2639ad600baa789f5bfe35d1e6f3377179ab02b52af8
+
+[http://www.freesmartphone.org/sources/vala-0.7.9.4.tar.bz2]
+md5=036faac08ab0898811e6bb92b5fba8de
+sha256=debefbb3ea7ae8318f6f5a064e593ecd1d93ba6c5c86c14019800f724c46690e
+
+[http://www.freesmartphone.org/sources/vala-0.7.9.5.tar.bz2]
+md5=147b5b9c37d4e2d814f582d6cf78c96a
+sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0
+
+[http://www.freesmartphone.org/sources/vala-0.7.9.6.tar.bz2]
+md5=d13ead3d2926b9e7abd7fe61c3a48181
+sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48
+
+[http://www.freesmartphone.org/sources/vala-0.7.9.7.tar.bz2]
+md5=b05fd8f4420152ca0080a99750863f3f
+sha256=46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a
+
[http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2]
md5=f2f8b2914361db599fd6392ec27f7042
sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d
@@ -30174,59 +30410,59 @@ sha256=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
md5=475f19a2ffbfab9a0886791c5f89c978
sha256=2497487e51cb2e94dfe540b9084f625f8018eb0853a699d724be790b26d9fd15
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfcalendar-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfcalendar-4.2.0.tar.gz]
md5=519ae7186ed4c083fdbe452cc24f8837
sha256=36130c0535c34a5d7873a9ccf82aa45cd1aa5d0ad7191e4c7cc71faac9fbd3e7
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfcalendar-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfcalendar-4.2.2.tar.gz]
md5=d964e45cc1d21f482f5e303129491987
sha256=910a65a81b7efb18e638105a46cb1249df041df6e66fcfcb58ac7e95baaa7976
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xfcalendar-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfcalendar-4.2.3.tar.gz]
md5=d2e2c8e010cca708295aeaf621086205
sha256=ad8d141d23f48736180d3913a0600d1733d71a341fd1889e69f727a998cfa0a3
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-manager-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-mcs-manager-4.2.2.tar.gz]
md5=9f6cdb3f11fc57a458fe7c91540181c9
sha256=b075e7503089a1e0b7a156fb05871ba83c4a20d22b822a4599545b6a3e410c40
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-manager-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfce-mcs-manager-4.2.3.tar.gz]
md5=029e7cc2b20a3de5f908483b4253f492
sha256=9bc1d715ee77a3d910214dd2fe6f537ee39960177f869a781361535a8d9a1828
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-mcs-manager-4.3.99.2.tar.bz2]
md5=59d6d8f4f931b562b39ea1decdf9e29e
sha256=951cb843f1c98fb68e0ab71f260dda9bc77ffd7b3aa16883d22e395134125c48
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-manager-4.4.2.tar.bz2]
md5=876a4b5d582de8fdc01457df2e7e1339
sha256=65531403c4b24f1be031e57a935b9a464661c47764cb913888aa86ed03ecb268
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-mcs-plugins-4.2.2.tar.gz]
md5=6e23972a2a0b3b3e7852bfc68dc0eeb8
sha256=693166e49eac35a85e66a7ad5dee046657f08937dc0a9144ecd26148ab9917a9
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xfce-mcs-plugins-4.2.3.tar.gz]
md5=cdd1ca3ff7610a45658aa801b91da8dc
sha256=57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-mcs-plugins-4.3.99.2.tar.bz2]
md5=6234425227e1145319bd75ef52fa97f5
sha256=f2773a4c007139f0a06c418b3535374ebeed8e10eef41d3ae69f4259f6f632a5
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2]
md5=77fcc929058de530d4f91eb25de851a1
sha256=e16610264256248bfd8ca227c7861000abf0c323611ad34913b06c41af0c9be5
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce-utils-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce-utils-4.2.2.tar.gz]
md5=585e1fd48dee70c50271ac478e8adcd0
sha256=67091b02a85c9700d574416c4adfca6db042b679ac3234228967f4a6c560ad93
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce-utils-4.3.99.2.tar.bz2]
md5=de6502dd93176b2a60e2e66bf052024f
sha256=a40832c874dda5a06c0208cd178a8d02cd61cb2379aa46cdffbe3fb592fd551c
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce-utils-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce-utils-4.4.2.tar.bz2]
md5=119dd3f1daedfa41e3be89bad8997336
sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
@@ -30234,19 +30470,19 @@ sha256=eba910fb99598e09fa4c41c4ab405216a2b59a837a3ab058656360ec2324314c
md5=1aa2362b11e79e56d52ce0d265faf1b6
sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce-utils-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce-utils-4.6.1.tar.bz2]
md5=1aa2362b11e79e56d52ce0d265faf1b6
sha256=8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-appfinder-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-appfinder-4.2.2.tar.gz]
md5=0ef8c944e8aa2db06719e02b2c40d70c
sha256=4bca692e0af03c0f70c6cf62f2b60274e71899beaa45815c2d0f46f7f19c06d5
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-appfinder-4.3.99.2.tar.bz2]
md5=a4636f51d79eb68ba65098336d120d56
sha256=1e6c80b800dd02f6b1cbf69df36307cc0b341ab73438c5508ac760fd8be66232
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-appfinder-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-appfinder-4.4.2.tar.bz2]
md5=0bdd0b1e96a1e1cf50ce5d582758b992
sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c
@@ -30254,35 +30490,35 @@ sha256=bdf232505f240d0933ca3cd7d2a5c07c31477a70570d95111f94a1226bf7e59c
md5=a1bc7d88100cfd92714a300be531589b
sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-appfinder-4.6.1.tar.bz2]
md5=a1bc7d88100cfd92714a300be531589b
sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-dev-tools-4.4.0.1.tar.bz2]
md5=7d09d161efc7ef86b3b48791d98c8ae8
sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e
-[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
md5=c9587fa78e877eee858a33391d0afd62
sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-dev-tools-4.6.0.tar.bz2]
md5=c9587fa78e877eee858a33391d0afd62
sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2]
md5=d3e3e64596a7efa857d2e6bb0cbd09bb
sha256=72178637c479ba848747285e0c7dc53a3abfe26b6517df5e75c7449542017350
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-mixer-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-mixer-4.2.2.tar.gz]
md5=fd5eb62c04d10659402a228b304f735b
sha256=9d145dd0ad09c1bd1efe357bd0413fabc93945d7986d3f4662ac515625da93bc
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-mixer-4.3.99.2.tar.bz2]
md5=9648fc403f9eb4baede230644bf5638d
sha256=6beda572195d6f7ed108e0659592d1ca6ad5088e769e3d219cc4114533f8b169
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-mixer-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-mixer-4.4.2.tar.bz2]
md5=c21cb5680f135dc86e5f0a6f9473003a
sha256=b390241dfddbc10ae1b870d1326a7675b9ac99e13c89326ba2accea3bfecc47a
@@ -30294,7 +30530,7 @@ sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
md5=a99e2455445480ef5081fe69454a46fc
sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-mixer-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-mixer-4.6.1.tar.bz2]
md5=a99e2455445480ef5081fe69454a46fc
sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
@@ -30302,15 +30538,15 @@ sha256=cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
md5=659ecaf37f0f7ee9e31f7b25f9813778
sha256=989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfce4-panel-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfce4-panel-4.2.2.tar.gz]
md5=50699e6c8e4a79f0a4f962e12559c9d0
sha256=b29e8524c448b9712f5eff0d7702706289a4a2967125b82a92a50ca142cc2d66
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfce4-panel-4.3.99.2.tar.bz2]
md5=53f96a9db5628ac1c629c9e5ecd842e4
sha256=1925b19457594b5e2a57f07f649375be428a038eb821c8b445dc1e7d2fe9c769
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-panel-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-panel-4.4.2.tar.bz2]
md5=8f26b32c442bf9926f98f285a3c251dd
sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
@@ -30318,7 +30554,7 @@ sha256=ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
md5=73a366b9892152266b465d7d9c35bef4
sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-panel-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-panel-4.6.1.tar.bz2]
md5=73a366b9892152266b465d7d9c35bef4
sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
@@ -30326,7 +30562,7 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
md5=88352816c84cbea57121b0c478976976
sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-session-4.4.2.tar.bz2]
md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
@@ -30334,7 +30570,7 @@ sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
md5=7628be41ed3511a20cff5673d9d39858
sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-session-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-session-4.6.1.tar.bz2]
md5=7628be41ed3511a20cff5673d9d39858
sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
@@ -30342,7 +30578,7 @@ sha256=feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
md5=dc1c8704471c5b0104fa10c30eb60cb6
sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfce4-settings-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfce4-settings-4.6.1.tar.bz2]
md5=dc1c8704471c5b0104fa10c30eb60cb6
sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
@@ -30350,7 +30586,7 @@ sha256=36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
md5=d4d3018767ea9eb4b57cc57d4038023b
sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfconf-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfconf-4.6.1.tar.bz2]
md5=d4d3018767ea9eb4b57cc57d4038023b
sha256=22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
@@ -30362,19 +30598,19 @@ sha256=111baa16780429d6739ab69b7393a18d75a10b7615dcc8cd0b0878ab9a5e2e1e
md5=26c83a6fe245906cc05055abf877d0f2
sha256=a3fe35b19aa957e5261a12ef78de2c62b47796aa612b2334088b3d98dcd77e8f
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfdesktop-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfdesktop-4.2.0.tar.gz]
md5=1cacd48e0ab475f4fd55d79020d60c55
sha256=45a6c30d33f9b887d13f0dd6458e9055dae6664c307b24a68594fcff73d22127
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfdesktop-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfdesktop-4.2.2.tar.gz]
md5=746641ae286994c0f42d7c4f58a90716
sha256=abba9b334012c8d3771939d8644e25d1560f18174e94eda155c65c87924f08d1
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfdesktop-4.3.99.2.tar.bz2]
md5=d44a81b9da9598425d9dd8dcd1cd5485
sha256=427df09a88f9b4a38fbed68d8154090bf0c11fbdc132c26247dc5568ee5ae910
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfdesktop-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfdesktop-4.4.2.tar.bz2]
md5=694601234e74903d0fccba064f411e0c
sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
@@ -30382,19 +30618,19 @@ sha256=7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
md5=ae15cacc3e3834cca7238a8e1035c50d
sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfdesktop-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfdesktop-4.6.1.tar.bz2]
md5=ae15cacc3e3834cca7238a8e1035c50d
sha256=22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xffm-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xffm-4.2.0.tar.gz]
md5=476b50335da473d46b12f43a07a28e83
sha256=dcd12681eaaf2b88dd512023949080b6d47426ff855efc03329790ab479280c9
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xffm-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xffm-4.2.2.tar.gz]
md5=5eb5ede5b2bfac564c26d96ee06a3241
sha256=0cde8831dc56669a046f6284b0a8dabd583942837e41832e7ed57e57020c4446
-[http://www.us.xfce.org/archive/xfce-4.2.3/src/xffm-4.2.3.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3/src/xffm-4.2.3.tar.gz]
md5=5d2a990bb725b6720db93f34dd91a731
sha256=791a05a2fd695508ff6b3fd3e0e2be66de28a3d0bf86ee22e14126992d7aef21
@@ -30414,15 +30650,15 @@ sha256=7a66ba3910bd7e39d58f9d4a4a588f191a874b8607369fe2cc9203a7115006a9
md5=d1df7b8622b7f8ebca4b2463118d7073
sha256=b87b5f171cb4d61e35ff0fda9231166c4b6132fe512b05e8ff63a91be47eab43
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfprint-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfprint-4.2.0.tar.gz]
md5=dce7378c3961122ca20b2518e939e57c
sha256=6d643173a9ae18e1daa3566503bc461e9a056470595ec059b2eea70e4113b77b
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfprint-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfprint-4.3.99.2.tar.bz2]
md5=c2eb9dee0002e875b91e73557f7354a1
sha256=4eee12555dbc296fa26afbfdbfabad3586000239d5666e54b6bfae7f8cd03e89
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfprint-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfprint-4.4.2.tar.bz2]
md5=be4802807e74dea30f4825102ceff5c5
sha256=b9bb03820a8ba1995ffe3e5b96b6d5ebbbc0347ad1202172f13bba63b2984d54
@@ -30434,7 +30670,7 @@ sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
md5=d92fca97a42816085080baf07a99a62e
sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfprint-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfprint-4.6.1.tar.bz2]
md5=d92fca97a42816085080baf07a99a62e
sha256=be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
@@ -30486,23 +30722,23 @@ sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
md5=632c7745f884dc5e6fd707a18971aca3
sha256=b3195456c99ab66103fd235ab410d6f3e6a56f2bdb7fb31d9d3789f2d453ec3f
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfwm4-4.2.0.tar.gz]
md5=da6d773f31ef91400174c2045f0f1a80
sha256=4ba4bad5bf750045175dc6af58ec29d046c91fa30c3b769213ce69fc739c8046
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfwm4-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfwm4-4.2.2.tar.gz]
md5=e4c91c59da7d1bdc6141cde3263ea6f9
sha256=02ab845725c59d4a2b6299e8d576df542011d7775637676080e9d76f02aa63da
-[http://www.us.xfce.org/archive/xfce-4.2.3.2/src/xfwm4-4.2.3.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.3.2/src/xfwm4-4.2.3.2.tar.gz]
md5=d73e89c50179ccb438c076b3b71d59a4
sha256=018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfwm4-4.3.99.2.tar.bz2]
md5=3186d90ae752cce9687698c8bd6b26c3
sha256=3600267ba477217f065628454bffb30d8819731940c7fdbfd197c731bca9125f
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfwm4-4.4.2.tar.bz2]
md5=21da77e50b07e72bba784bf3418ca067
sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
@@ -30510,23 +30746,23 @@ sha256=710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
md5=538ff2554a23bf877d336e573884da9a
sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
-[http://www.us.xfce.org/archive/xfce-4.6.1/src/xfwm4-4.6.1.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.1/src/xfwm4-4.6.1.tar.bz2]
md5=538ff2554a23bf877d336e573884da9a
sha256=0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
-[http://www.us.xfce.org/archive/xfce-4.2.0/src/xfwm4-themes-4.2.0.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.0/src/xfwm4-themes-4.2.0.tar.gz]
md5=a8d0676fbf9cd3b3514d76a39d4ecbe1
sha256=9aebac55dfc92a3533678a873d0f3babee285061b0ad5b26a56b6e72fb306ed4
-[http://www.us.xfce.org/archive/xfce-4.2.2/src/xfwm4-themes-4.2.2.tar.gz]
+[http://www.us.xfce.org/archive/xfce/4.2.2/src/xfwm4-themes-4.2.2.tar.gz]
md5=440977408bd1395f4464f18f01faf644
sha256=b458f3d9dc1f6370ac596862e1ebcbc3e5227e58450ea9c1172d7de6534e34a1
-[http://www.us.xfce.org/archive/xfce-4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.3.99.2/src/xfwm4-themes-4.3.99.2.tar.bz2]
md5=a77e9e700de66d38b6c4850a18283fb1
sha256=10b2f7ffbf309c12ec82b4bc28b35014cb223208d3003bab3765b70dea9d96bd
-[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfwm4-themes-4.4.2.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfwm4-themes-4.4.2.tar.bz2]
md5=fbea3ef7eec87fd669958f9cf597bfb8
sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
@@ -30534,7 +30770,7 @@ sha256=d6f6052ec9bdc2a048dd34a79248ee56abd903055adc0d89d04715eb17ac1dc0
md5=4dc5cb29cbd40e3b9dece12a85e20854
sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
-[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfwm4-themes-4.6.0.tar.bz2]
+[http://www.us.xfce.org/archive/xfce/4.6.0/src/xfwm4-themes-4.6.0.tar.bz2]
md5=4dc5cb29cbd40e3b9dece12a85e20854
sha256=9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
@@ -30974,6 +31210,10 @@ sha256=017530da4262a6e52c87cb8ea47aebc83fcd82346cc8072f02ba9de060407be3
md5=0e11f78c00e27e775c4606c7e021cbf4
sha256=ba875a916f4f9db29c87a48494fec65121ade424a7d98538920d326d8724bed1
+[http://familiar.handhelds.org/source/v0.8.4-rc2/sources/xmonobut-0.4.1.tar.gz]
+md5=41d9da556205c7cfcb86362387fa6493
+sha256=5002223fd102fc5bd454a8b62feb9d281f454769624a071804d6bfc82416a0b4
+
[http://www.handhelds.org/~philippe/sources/xmonobut-0.4.1.tar.gz]
md5=41d9da556205c7cfcb86362387fa6493
sha256=5002223fd102fc5bd454a8b62feb9d281f454769624a071804d6bfc82416a0b4
@@ -31882,7 +32122,7 @@ sha256=2822148fdf6f2054b51c776db21f71e817761c225b370ab3f3ce7efe3711368f
md5=1fa62e2309fa52e26a5594cc38911aee
sha256=2822148fdf6f2054b51c776db21f71e817761c225b370ab3f3ce7efe3711368f
-[http://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz]
+[ftp://ftp.info-zip.org/pub/infozip/src/zip232.tar.gz]
md5=8a4da4460386e324debe97f3b7fe4d96
sha256=d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 10a81f2943..0d8e9bcaf7 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,7 +47,8 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
PREFERRED_PROVIDER_opkg ?= "opkg"
#PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
+PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
+PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"
PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
PREFERRED_PROVIDER_tslib-conf ?= "tslib"
PREFERRED_PROVIDER_tslib ?= "tslib"
diff --git a/conf/distro/corecdp.conf b/conf/distro/corecdp.conf
new file mode 100644
index 0000000000..39ca74a170
--- /dev/null
+++ b/conf/distro/corecdp.conf
@@ -0,0 +1,43 @@
+#@TYPE: Distribution
+#@NAME: CoreCDP <http://www.multitech.net>
+#@DESCRIPTION: CoreCDP Linux Distribution for the MTCDP Cellular Development Platform
+#@MAINTAINER: Multi-Tech Systems <oe-devel@multitech.net>
+
+# Angstrom-based distribution by Multi-Tech Systems, Inc.
+require conf/distro/angstrom-2008.1.conf
+
+# allow use of amend.inc files in FILESPATH to add to existing recipes
+require conf/amend-recipes.inc
+
+DISTRO_NAME = "CoreCDP"
+DISTRO = "corecdp"
+DISTRO_VERSION = "1.1.1"
+DISTRO_TYPE = "release"
+TARGET_VENDOR = "-corecdp"
+BUILDNAME = "${DISTRO_NAME} ${DISTRO_VERSION}"
+
+# Add Multi-Tech mirror for source download as a backup
+INHERIT += "corecdp-mirrors"
+
+IPKG_VARIANT = "opkg-nogpg-nocurl corecdp-version"
+
+# use busybox instead of tinylogin
+IMAGE_LOGIN_MANAGER = "busybox"
+
+DEFAULT_TIMEZONE = "America/Chicago"
+
+# Java versions that work together
+# initial verions
+PREFERRED_VERSION_jamvm-initial ?= "1.4.5"
+PREFERRED_VERSION_classpath-initial ?= "0.93"
+
+# native versions
+PREFERRED_VERSION_jamvm-native ?= "1.5.3"
+PREFERRED_VERSION_classpath-native ?= "0.98"
+
+# target device
+PREFERRED_VERSION_jamvm ?= "1.5.2"
+PREFERRED_VERSION_classpath ?= "0.98"
+
+# don't build bluez4 and the large amount of deps just for libpcap
+PREFERRED_PROVIDER_libpcap = "libpcap-nobluetooth"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index d719453da8..f5c7974d5b 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -37,6 +37,7 @@ SRCREV_pn-libpersistence = "${AUTOREV}"
SRCREV_pn-mickeydbus = "${AUTOREV}"
SRCREV_pn-mickeyterm = "${AUTOREV}"
SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-msmcommd = "${AUTOREV}"
SRCREV_pn-python-pytrc = "${AUTOREV}"
SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
SRCREV_pn-vala-native = "${AUTOREV}"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 34f0386772..8b120f2eb2 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -4,7 +4,7 @@
#@NAME: KaeilOS(R) - http://www.kaeilos.com
#@DESCRIPTION: KaeilOS Linux Distribution preferred version
#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 21-10-2009
+#@VERSION: 11-01-2010
#
# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
# Product website : http://www.KaeilOS.com
@@ -14,7 +14,7 @@ PREFERRED_VERSION_autoconf = "2.63"
PREFERRED_VERSION_autoconf-native = "2.63"
PREFERRED_VERSION_automake-native = "1.10.2"
PREFERRED_VERSION_busybox = "1.13.2"
-PREFERRED_VERSION_cairo = "1.8.0"
+PREFERRED_VERSION_cairo = "1.8.8"
PREFERRED_VERSION_dbus = "1.2.3"
PREFERRED_VERSION_dropbear = "0.51"
PREFERRED_VERSION_fontconfig = "2.6.0"
@@ -23,36 +23,49 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1"
PREFERRED_VERSION_glibmm = "2.22.1"
PREFERRED_VERSION_glproto = "1.4.9"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_gtk+ = "2.18.0"
+PREFERRED_VERSION_gtk+ = "2.18.3"
PREFERRED_VERSION_gtkmm = "2.18.1"
PREFERRED_VERSION_hal = "0.5.13"
PREFERRED_VERSION_libgemwidget = "1.0"
PREFERRED_VERSION_libgpephone = "0.4"
-PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libsdl-x11 = "1.2.14"
PREFERRED_VERSION_libtool = "2.2.6a"
PREFERRED_VERSION_libtool-native = "2.2.6a"
PREFERRED_VERSION_libtool-cross = "2.2.6a"
PREFERRED_VERSION_libtool-sdk = "2.2.6a"
-PREFERRED_VERSION_libx11 = "1.2"
-PREFERRED_VERSION_mesa = "7.4"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
+PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr30165"
PREFERRED_VERSION_pango = "1.24.4"
-PREFERRED_VERSION_pixman = "0.13.2"
+PREFERRED_VERSION_pixman = "0.16.2"
PREFERRED_VERSION_pkgconfig = "0.23"
PREFERRED_VERSION_pkgconfig-native = "0.23"
PREFERRED_VERSION_pulseaudio = "0.9.15"
-PREFERRED_VERSION_python = "2.6.1"
-PREFERRED_VERSION_samba = "3.3.0"
+PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_samba = "3.3.9"
PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+KAEILOS_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}"
+
PREFERRED_VERSION_udev = "141"
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.9"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg = "1.6.1"
+
+# Use latest version available
+#PREFERRED_VERSION_util-macros-native = "1.4.1"
+#PREFERRED_VERSION_util-macros = "1.4.1"
+#PREFERRED_VERSION_xserver-xorg = "1.7.3"
+#PREFERRED_VERSION_xf86-video-xgi = "1.5.1"
#
# meta-moblin package SRCREVs
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index fd83e02afe..39b1f0764e 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -17,7 +17,7 @@ PREFERRED_VERSION_classpath-native = "0.98"
PREFERRED_VERSION_linux-libc-headers = "2.6.31"
# override EFL_SRCREV from sane-srcrevs.inc
-EFL_SRCREV ?= "44424"
+# EFL_SRCREV ?= "44424"
# specifically set an openssh version
# NOTE: whenever changing the version here make sure
@@ -36,6 +36,15 @@ PREFERRED_VERSION_usbutils = "0.82"
PREFERRED_VERSION_wpa-supplicant = "0.6.9"
UDEV_GE_141 = "1"
+ANGSTROM_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
+
+
# Downgraded
# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
PREFERRED_VERSION_python-pygtk = "2.10.4"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index 85fa1cfd0d..11640d5cdc 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -57,6 +57,7 @@ PREFERRED_VERSION_xgamma ?= "1.0.2"
PREFERRED_VERSION_xhost ?= "1.0.2"
PREFERRED_VERSION_xinput ?= "1.3.0"
PREFERRED_VERSION_xkbcomp ?= "1.0.5"
+PREFERRED_VERSION_xkbcomp-native ?= "1.0.5"
PREFERRED_VERSION_xkbevd ?= "1.0.2"
PREFERRED_VERSION_xkbutils ?= "1.0.1"
PREFERRED_VERSION_xkill ?= "1.0.1"
@@ -157,11 +158,13 @@ PREFERRED_VERSION_libdmx ?= "1.0.2"
PREFERRED_VERSION_libfs ?= "1.0.1"
PREFERRED_VERSION_libice ?= "1.0.4"
PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libpciaccess ?= "0.10.3"
PREFERRED_VERSION_libsm ?= "1.1.0"
PREFERRED_VERSION_libwindowswm ?= "1.0.0"
PREFERRED_VERSION_libx11 ?= "1.1.5"
PREFERRED_VERSION_libx11-native ?= "1.1.1"
PREFERRED_VERSION_libxau ?= "1.0.4"
+PREFERRED_VERSION_libxau-native ?= "1.0.3"
PREFERRED_VERSION_libxaw ?= "1.0.4"
PREFERRED_VERSION_libxcomposite ?= "0.4.0"
PREFERRED_VERSION_libxcursor ?= "1.1.9"
@@ -177,6 +180,8 @@ PREFERRED_VERSION_libxft ?= "2.1.13"
PREFERRED_VERSION_libxi ?= "1.1.3"
PREFERRED_VERSION_libxinerama ?= "1.0.3"
PREFERRED_VERSION_libxkbfile ?= "1.0.5"
+PREFERRED_VERSION_libxkbfile-native ?= "1.0.5"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
PREFERRED_VERSION_libxmu ?= "1.0.4"
PREFERRED_VERSION_libxpm ?= "3.5.7"
PREFERRED_VERSION_libxrandr ?= "1.2.3"
@@ -200,16 +205,20 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.1"
# proto
PREFERRED_VERSION_applewmproto ?= "1.0.3"
PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
PREFERRED_VERSION_compositeproto ?= "0.4"
PREFERRED_VERSION_damageproto ?= "1.1.0"
PREFERRED_VERSION_dmxproto ?= "2.2.2"
PREFERRED_VERSION_dri2proto ?= "1.1"
+PREFERRED_VERSION_evieext ?= "1.0.2"
PREFERRED_VERSION_fixesproto ?= "4.0"
PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
PREFERRED_VERSION_fontsproto ?= "2.0.2"
PREFERRED_VERSION_glproto ?= "1.4.9"
PREFERRED_VERSION_inputproto ?= "1.4.4"
+PREFERRED_VERSION_inputproto-native ?= "1.4.2"
PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_kbproto-native ?= "1.0.3"
PREFERRED_VERSION_randrproto ?= "1.2.1"
PREFERRED_VERSION_recordproto ?= "1.13.2"
PREFERRED_VERSION_renderproto ?= "0.9.3"
@@ -219,9 +228,12 @@ PREFERRED_VERSION_trapproto ?= "3.4.3"
PREFERRED_VERSION_videoproto ?= "2.2.2"
PREFERRED_VERSION_windowswmproto ?= "1.0.3"
PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
PREFERRED_VERSION_xextproto ?= "7.0.3"
PREFERRED_VERSION_xextproto-native ?= "7.0.3"
+PREFERRED_VERSION_xineramaproto ?= "1.1.2"
PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
PREFERRED_VERSION_xf86driproto ?= "2.0.4"
PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
@@ -234,6 +246,7 @@ PREFERRED_VERSION_xproto ?= "7.0.13"
PREFERRED_VERSION_gccmakedep ?= "1.0.2"
PREFERRED_VERSION_imake ?= "1.0.2"
PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_makedepend-native ?= "1.0.1"
PREFERRED_VERSION_util-macros-native ?= "1.1.6"
PREFERRED_VERSION_util-macros ?= "1.1.6"
PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 6e8c93a95a..368f766a5b 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -229,6 +229,9 @@ PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
PREFERRED_VERSION_libpciaccess ?= "0.10.9"
PREFERRED_VERSION_libxkbfile ?= "1.0.6"
PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_mesa-dri ?= "7.2"
+PREFERRED_VERSION_mesa-xlib ?= "7.2"
PREFERRED_VERSION_xtrans ?= "1.2.5"
PREFERRED_VERSION_xtrans-native ?= "1.2.5"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index ca32b4fdb2..733b15e78b 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,46 +1,48 @@
# To be included from sane-srcrevs.inc
# FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
+FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28"
SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
-SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsomusicd ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
-SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14"
-SRCREV_pn-libfsoframework ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
+SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
# FSO Projects -- Misc
SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819"
+SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5"
SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
-SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30"
+SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
+SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e"
SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
-SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
+SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb"
+SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3"
SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d"
SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
-SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
-SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
+SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9"
+SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb"
SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f"
SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
-SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0"
+SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f"
SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f942057adb..207c320a66 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -78,7 +78,7 @@ SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffalarms ?= "67"
SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-fltk2 ?= "6671"
+SRCREV_pn-fltk2 ?= "6916"
SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
@@ -130,7 +130,7 @@ SRCREV_pn-libmokogsmd2 ?= "4334"
SRCREV_pn-libmokojournal2 ?= "3473"
SRCREV_pn-libmokopanelui2 ?= "4568"
SRCREV_pn-libmokoui2 ?= "4695"
-SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17"
+SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c"
SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a"
@@ -147,11 +147,11 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1089"
SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
-SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca"
-SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
-SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
+SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
+SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -181,7 +181,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
SRCREV_pn-multitap-pad ?= "373"
SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2890"
+SRCREV_pn-navit ?= "2902"
SRCREV_pn-navit-icons ?= "2871"
SRCREV_pn-neod ?= "4617"
SRCREV_pn-neomis ?= "6"
@@ -262,7 +262,7 @@ SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091"
SRCREV_pn-portaudio-v19 ?= "1387"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
SRCREV_pn-pyefl-sudoku ?= "49"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pyphonelog ?= "45783c7fd5ec274421bf87a5cdb372c122370fda"
@@ -278,12 +278,15 @@ QEMUSRCREV ?= "4242"
SRCREV_pn-qemu ?= "${QEMUSRCREV}"
SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
-SRCREV_pn-qi ?= "3b8513d8b3d9615ebda605de4bda18371aa3f359"
+SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
+SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
+SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
+SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
SRCREV_pn-remoko ?= "121"
SRCREV_pn-remoko-server ?= "121"
SRCREV_pn-s3c24xx-gpio ?= "4949"
SRCREV_pn-s3c64xx-gpio ?= "4949"
-SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+SRCREV_pn-serial-forward ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
SRCREV_pn-settings-daemon ?= "2006"
SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
@@ -300,7 +303,7 @@ SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb"
SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b"
@@ -331,7 +334,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 ?= "44165"
+EFL_SRCREV ?= "45060"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 7bf196371d..04fde21b25 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -26,7 +26,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 glibc and some userspaceapps require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.30"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.31"
# 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"
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2010.1.conf
index 0d3cc0b908..c60d65ddb8 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -1,17 +1,20 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Jlime 2009.1 <http://jlime.com>
+#@NAME: Jlime 2010.1 <http://www.jlime.com>
#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
# HP Jornada 620/660/680/690/720/728 handheld pc + Nec MP900c,
# Ben Nanonote.
+# Unofficial support for Netbook pro, Bsquare Maui.
#@MAINTAINER: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
+#@MAINTAINER: Alex Ferguson <thoughtmonster@gmail.com>
+#@MAINTAINER: Filip Zyzniewski <filip.zyzniewski@gmail.com>
#-----------------------------------------------------------------------------
#
# Header
#
DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "2009.1"
+DISTRO_VERSION = "2010.1"
DISTRO_TYPE = "release"
export FEED_URLS_jlime = "http://repository.jlime.com/"
@@ -37,6 +40,7 @@ SPLASH = "psplash"
INHERIT += "debian package_tar package_ipk src_distribute_local"
SRC_DIST_LOCAL ?= "symlink"
IMAGE_FSTYPES = "tar.gz tar.bz2 jffs2"
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
#
# Kernel
@@ -98,14 +102,17 @@ require conf/distro/include/sane-srcrevs.inc
#
# Framebuffer & X
#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
#
# General Userspace
#
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
PREFERRED_VERSION_cdparanoia = "10.2"
-require conf/distro/include/preferred-opie-versions-1.2.4.inc \ No newline at end of file
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
deleted file mode 100644
index db964f00bc..0000000000
--- a/conf/distro/jlime-donkey.conf
+++ /dev/null
@@ -1,139 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "jlime"
-DISTRO_VERSION = "donkey"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-export FEED_URLS_jlime = "donkey##http://donkey-${ARCH}.jlime.com"
-
-#<>----------------------------------------------------------------->
-#<> No uniroot
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#<>----------------------------------------------------------------->
-#<> We will set CVS DATE when things are known to work.
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-#<>----------------------------------------------------------------->
-#<> We want this so we can crosscompile the kernel using gcc 3.4.3
-#<> Also, select version of modules (and kernel)
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-3.4.4:gcc-cross-kernel"
-PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-${MACHINE}"
-
-
-#<>----------------------------------------------------------------->
-#<>We want kdrive as our default X-Server.
-#<>-----------------------------------------------------------------<
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-
-
-#<>----------------------------------------------------------------->
-#<>Setting Preferred Binutils,gcc,glibc and linux-libc-headers
-#<>-----------------------------------------------------------------<
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_binutils-cross-sdk = "2.18"
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
-PREFERRED_VERSION_glibc = "2.6.1"
-PREFERRED_VERSION_glibc-initial = "2.6.1"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
-#<>------------------------------------------------------------------<
-#PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-
-#<>------------------------------------------------------------------>
-#<>
-#<>System-critical software with known working versions.
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.24"
-PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_busybox = "1.9.1"
-
-#<>------------------------------------------------------------------>
-#<>Other Specific stuff.
-#<>
-#<>
-#<>We want to be able to build this for all jornadas so
-#<>to not mess up the folders we need to make them dynamic.
-#<>It will use different folders depending on Arch (set in local.conf)
-#<>------------------------------------------------------------------<
-SRC_DIST_LOCAL = "copy"
-INHERIT += "package_ipk package_tar src_distribute_local"
-BBINCLUDELOGS = "yes"
-IMAGE_FSTYPES = "tar.bz2"
-TARGET_OS = "linux"
-
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate tslib-tests console-tools \
- parted dialog"
-
-
-#<>------------------------------------------------------------------>
-#<>What Qte, libqte.. versions should we use.
-#<>------------------------------------------------------------------<
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions-1.2.3.inc
-
-
-#<>------------------------------------------------------------------>
-#<> We want pcmciautils, not pcmcia-cs
-#<>------------------------------------------------------------------<
-PCMCIA_MANAGER = "pcmciautils"
-
-
-#<>------------------------------------------------------------------>
-#<> We are using gcc 4.1.1 so lets keep optimizations low
-#<>------------------------------------------------------------------<
-FULL_OPTIMIZATION = "-O2"
-
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
-
-
-#<>------------------------------------------------------------------>
-#<>
-#<>
-#<> General non-essential programs with known working versions
-#<>
-#<>------------------------------------------------------------------<
-PREFERRED_VERSION_tightvnc = "1.3.9"
-PREFERRED_VERSION_xmonobut = "0.4"
-PREFERRED_VERSION_konqueror-embedded = "20070212"
-#PREFERRED_VERSION_encodings = "X11R7.0-1.0.0"
-PREFERRED_VERSION_icewm = "1.2.34"
-PREFERRED_VERSION_xchat = "1.8.11"
-PREFERRED_VERSION_rxvt = "2.6.4"
diff --git a/conf/distro/jlime-henchman.conf b/conf/distro/jlime-henchman.conf
deleted file mode 100644
index 14ea57d18c..0000000000
--- a/conf/distro/jlime-henchman.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Jlime Henchman <jlime.com>
-#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-# NEC Mobile Pro 900/900c handheld pc.
-#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "Henchman"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
-#export FEED_URLS_jlime = "henchman##http://henchman.jlime.com/feed"
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
- console-tools tslib-tests parted dialog"
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Henchman-${MACHINE}"
-
-#
-# Naming schemes
-#
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-IMAGE_FSTYPES = "tar.bz2"
-
-#
-# Kernel
-#
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-
-#
-# Target OS & FPU system
-#
-TARGET_OS = "linux"
-TARGET_FPU_arm = "fixed"
-TARGET_FPU_armeb = "fixed"
-
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.23"
-PREFERRED_VERSION_glibc = "2.5"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-mongo.conf b/conf/distro/jlime-mongo.conf
deleted file mode 100644
index 2e6c43462e..0000000000
--- a/conf/distro/jlime-mongo.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-#-----------------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: Jlime Mongo <jlime.com>
-#@DESCRIPTION: Jlime Mobility Embedded Linux Distribution for the
-# HP Jornada 720/728 handheld pc.
-#@MAINTAINER: Matt Oudenhoven <wicked5850@yahoo.com>
-#-----------------------------------------------------------------------------
-
-#
-# Header
-#
-DISTRO_NAME = "Jlime"
-DISTRO_VERSION = "Mongo"
-#DISTRO_TYPE = "release"
-#DISTRO_TYPE = "debug"
-
-export FEED_URLS_jlime = "http://mongo.jlime.com/feed"
-
-#<>------------------------------------------------------------------>
-#<>What we want on the bootstrap image (extra)
-#<>
-#<>------------------------------------------------------------------<
-DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
- console-tools tslib-tests parted dialog"
-
-#<>------------------------------------------------------------------>
-#<>Our Image files should look abit better.
-#<>
-#<>------------------------------------------------------------------<
-IMAGE_NAME = "${IMAGE_BASENAME}-Mongo-${MACHINE}"
-
-#
-# Naming schemes
-#
-INHERIT += "debian"
-
-#
-# Packaging and output format
-#
-INHERIT += "package_ipk"
-INHERIT += "package_tar"
-IMAGE_FSTYPES = "tar.bz2"
-
-#
-# Kernel
-#
-KERNEL = "kernel26"
-MACHINE_KERNEL_VERSION = "2.6"
-
-#
-# Binutils & Compiler
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-PREFERRED_VERSION_gcc = "4.2.2"
-PREFERRED_VERSION_gcc-cross = "4.2.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.2.2"
-PREFERRED_VERSION_gcc-cross-intermediate = "4.2.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-
-#
-# Target OS & FPU system
-#
-TARGET_OS = "linux"
-TARGET_FPU_arm = "soft"
-TARGET_FPU_armeb = "soft"
-
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-
-PREFERRED_VERSION_linux-libc-headers = "2.6.18"
-PREFERRED_VERSION_glibc = "2.5"
-
-#
-# Bootstrap & Init
-#
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-
-#
-# Framebuffer & X
-#
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
-#
-# GPE
-#
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-PALMTOP_USE_MULTITHREADED_QTE = "yes"
-OPIE_VERSION = "1.2.3"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf
deleted file mode 100644
index 98844d76a4..0000000000
--- a/conf/distro/jlime-shrek.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Jornada Linux Mobility Edition (JLime) <www.jlime.com>
-#@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series)
-#@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com>
-
-DISTRO_NAME = "JLime"
-DISTRO_VERSION = "Shrek"
-DISTRO_TYPE = "release"
-
-export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/Releases/shrek/${TARGET_ARCH}/feed/"
-
-SRCDATE = "20050518"
-
-PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-intermediate"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-LIBC = "glibc"
-require conf/distro/include/${LIBC}.inc
-PREFERRED_PROVIDER_virtual/kernel = "jlime-kernel-${TARGET_ARCH}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-
-PREFERRED_VERSION_binutils = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_gcc = "3.4.3"
-PREFERRED_VERSION_gcc-cross = "3.4.3"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.3"
-PREFERRED_VERSION_gcc-cross-intermediate = "3.4.3"
-PREFERRED_VERSION_linux-libc-headers = "2.6.7.0"
-PREFERRED_VERSION_glib-2.0-native = "2.6.2"
-PREFERRED_VERSION_glib-2.0 = "2.6.2"
-PREFERRED_VERSION_dpkg = "1.10.23"
-PREFERRED_VERSION_xserver-kdrive = "20050207"
-
-INHERIT += "package_tar package_ipk"
-BBINCLUDELOGS = "yes"
-MODUTILS = "26"
-IMAGE_FSTYPES = "tar.bz2"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \
-kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \
-kernel-module-airo-cs kernel-module-airo console-tools \
-kernel-module-arlan \
-kernel-module-atmel-cs kernel-module-atmel kernel-module-axnet-cs \
-kernel-module-hermes \
-kernel-module-wavelan kernel-module-wavelan-cs \
-kernel-module-xirc2ps-cs kernel-module-orinoco-cs kernel-module-orinoco \
-kernel-module-nmclan-cs kernel-module-pcnet-cs e2tools e2fsprogs"
-
-TARGET_OS = "linux"
-
-OPIE_VERSION = "1.2.1"
-require conf/distro/include/preferred-opie-versions.inc
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 4d790f4e1f..ee187ba0c9 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,7 @@
#@NAME: KaeilOS(R) - http://www.kaeilos.com
#@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 23-10-2009
+#@VERSION: 11-01-2010
#
# KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
# Product website : http://www.KaeilOS.com
@@ -59,6 +59,7 @@ CVS_TARBALL_STASH ?= "\
http://www.angstrom-distribution.org/unstable/sources/ \
"
+
#Make sure we use 2.6 on machines with a 2.4/2.6 selector
KERNEL = "kernel26"
MACHINE_KERNEL_VERSION = "2.6"
@@ -72,29 +73,13 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
#KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
#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.31"
# see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
PREFERRED_VERSION_glibc ?= "2.9"
PREFERRED_VERSION_glibc-initial ?= "2.9"
-
-PREFERRED_VERSION_uclibc ?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.30"
-
-# Preferred provider for virtual/psplash
-# This enforces a specific brand to be used, in our case the angstrom
-# one. In case you want to change the logo or something like that we
-# suggest you to create another recipe (e.g: psplash-<brand>) for that
-# and add that into your image.
-# You can also opt to change or override this line, but that isn't
-# needed because psplash is using update-alternatives.
-#PREFERRED_PROVIDER_virtual/psplash ?= "psplash-kaeilos"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
-PREFERRED_PROVIDER_virtual/gail ?= "gtk+"
-
-PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
#powerpc needs additional patches to gcc
ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1"
@@ -105,15 +90,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
ANGSTROM_GCC_VERSION_bfin = "4.1.2"
# 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"
+#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
+KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
#avr32 only has support for gcc 4.2.2
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
+#armv4 needs at least gcc 4.4.2 for eabi
+ANGSTROM_GCC_VERSION_armv4 ?= "4.4.2"
+
#Everybody else can just use this:
ANGSTROM_GCC_VERSION ?= "4.3.3"
ANGSTROM_BINUTILS_VERSION ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv4 ?= "2.20"
ANGSTROM_BINUTILS_VERSION_armv7a ?= "2.18.50.0.7"
PREFERRED_VERSION_binutils ?= "${ANGSTROM_BINUTILS_VERSION}"
@@ -134,75 +124,29 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
# Toolchain virtuals:
require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db ?= "db"
-PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
-
-# Others:
PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER_esound ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf ?= "gconf"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp ?= "ntp"
PREFERRED_PROVIDER_hotplug = "udev"
-PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
-PREFERRED_PROVIDER_libxss = "libxss"
-PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs = "bluez4"
-PREFERRED_PROVIDER_bluez-utils = "bluez4"
-PREFERRED_PROVIDER_util-linux = "util-linux-ng"
+PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl"
# see recipes/bluez/bluez4*.bb for further dependencies of this setting
ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+ ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
-
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-require conf/distro/include/kaeilos.inc
-
+ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough"
+require conf/distro/include/kaeilos.inc
# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
-IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
# Select xserver-xorg as default, since kdrive has been EOL'ed
XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+#PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+#PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
# do some task-base stuff here
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index ad8961196e..8e0ae2eb34 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -52,10 +52,11 @@ INHERIT += "packaged-staging"
# Chose the packaging system
INHERIT += "package_ipk"
IMAGE_FSTYPES ?= "tar.gz jffs2"
-
-require conf/distro/include/sane-feed.inc
PREFERRED_PKG_FORMAT ?= "ipk"
-require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
IPKG_VARIANT = "opkg-nogpg"
@@ -68,6 +69,7 @@ IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-$
CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}"
# increase inode/block ratio for ext2 filesystem
EXTRA_IMAGECMD_ext2 = "-i 8192"
@@ -96,8 +98,7 @@ require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-opie-versions-1.2.4.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 2ef04872fb..0e8e272b11 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -54,6 +54,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native"
PREFERRED_VERSION_glibc = "2.2.5"
+PREFERRED_VERSION_linux-libc-headers = "2.4.18"
IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
#INHIBIT_PACKAGE_STRIP = "1"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index b99c895dc2..5417f5b06d 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -25,8 +25,8 @@ DISTRO_NAME = "shr"
DISTRO_VERSION = "-${DATE}"
DISTRO_REVISION = "2"
DISTRO_PR = ".4"
-#DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
+DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
DISTRO = "shr"
DISTRO_SSH_DAEMON = "openssh"
@@ -47,6 +47,8 @@ INHERIT += "angstrom"
ANGSTROM_BLACKLIST_pn-bluez-libs = "bluez-libs 3.x has been replaced by bluez4"
ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4"
ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
+ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script"
+ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script"
CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 643ae0b611..2cff53bc1b 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -35,12 +35,6 @@ BBMASK = ""
# have to set PATH in your environment to make sure BitBake finds additional binaries.
# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc"
-# Uncomment this if you're building for an arch that uses emulated locale
-# generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler
-# that OE recognises. This will mean the gcc-native build is skipped, speeding
-# builds up.
-# ASSUME_PROVIDED += "gcc3-native"
-
# Uncomment this if you are building Linux 2.4 Embedix kernels.
# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget
# to rename the binaries as instructed in the Wiki.
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 6f71787fa1..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-# xserver-kdrive 1.3.0.0 is still the only working version:
-XSERVER = "xserver-kdrive-1300-fbdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/at91sam9g45ek.conf b/conf/machine/at91sam9g45ek.conf
new file mode 100644
index 0000000000..98fd7113c0
--- /dev/null
+++ b/conf/machine/at91sam9g45ek.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9G45EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9g45ek development board with a at91sam9g45-ES2 processor
+# Once a at91sam9g45ek development board with a production at91sam9g45 processor
+# is available we should change the recipe to use the at91sam9m10g45ek_defconfig
+
+include conf/machine/include/AT91-LCD.inc
+
+# Has linux config file in OpenEmbedded
+#
+# LINUX26_DEFCONFIG = "at91sam9g45ek_defconfig"
+# LINUX26_DEFCONFIG = "at91sam9m10g45ek_defconfig"
+
+# Supported u-boot machines
+#UBOOT_MACHINE = "at91sam9m10g45ek_nandflash_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_config"
+UBOOT_MACHINE = "at91sam9m10g45ek_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9m10g45ek_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_nandflash_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_dataflash_cs0_config"
+#UBOOT_MACHINE = "at91sam9g45ekes_config"
+
+# Boot from Dataflash, so we do not have to reprogram
+# At91bootstrap/U-Boot everytime we erase the NAND flash
+AT91BOOTSTRAP_BOARD = "at91sam9g45df"
+
+MACHINE_FEATURES += "usbhost"
+
diff --git a/conf/machine/ben-nanonote.conf b/conf/machine/ben-nanonote.conf
index 391f4a542d..08bcdea3e5 100644
--- a/conf/machine/ben-nanonote.conf
+++ b/conf/machine/ben-nanonote.conf
@@ -1,8 +1,11 @@
#@TYPE: Machine
#@NAME: Ben Nanonote
#@DESCRIPTION: Machine configuration for the Qi-Hardware's Ben Nanonote
+
TARGET_ARCH = "mipsel"
-PREFERRED_PROVIDER_virtual/kernel = "linux"
+require conf/machine/include/tune-mips32.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-ben"
KERNEL_IMAGETYPE = "uImage"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
index 3e0389a6ba..d79cf15129 100644
--- a/conf/machine/bug.conf
+++ b/conf/machine/bug.conf
@@ -14,3 +14,11 @@ CPU_FEATURES += "vfp"
require conf/machine/include/tune-arm1136jf-s.inc
KERNEL_IMAGETYPE = "uImage"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-tslib \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-input-keyboard"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 16073fee82..4daedde482 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc
# please set the right value in your local.conf
ROOT_FLASH_SIZE = "25"
-XSERVER = "xserver-kdrive-imageon"
-
MACHINE_GUI_CLASS = "bigscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "640"
MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 47f6e30dfd..66995e9b09 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14"
# actually 14680064
EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-XSERVER = "xserver-kdrive-fbdev"
-
MACHINE_GUI_CLASS = "smallscreen"
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 1fd51234e2..5a5161673b 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -5,4 +5,4 @@
require conf/machine/include/davinci.inc
require conf/machine/include/dm365.inc
-UBOOT_MACHINE = "davinci_dm365evm_config"
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/include/AT91-LCD.inc b/conf/machine/include/AT91-LCD.inc
new file mode 100644
index 0000000000..3036295f48
--- /dev/null
+++ b/conf/machine/include/AT91-LCD.inc
@@ -0,0 +1,15 @@
+# Common description for Atmel ARM processors with LCD controller
+
+include conf/machine/include/AT91.inc
+
+MACHINE_FEATURES += "screen touchscreen keyboard"
+
+# Some options we disable for now
+# MACHINE_FEATURES += "apm"
+# MACHINE_FEATURES += "lcd"
+# MACHINE_FEATURES += "bluetooth wifi irda phone gps"
+# MACHINE_FEATURES += "mmc mmcroot fat"
+# MACHINE_FEATURES += "i2c spi serial"
+# MACHINE_FEATURES += "sound libogg libvorbis"
+
+
diff --git a/conf/machine/include/AT91.inc b/conf/machine/include/AT91.inc
new file mode 100644
index 0000000000..6c0f8f04ac
--- /dev/null
+++ b/conf/machine/include/AT91.inc
@@ -0,0 +1,51 @@
+# Common description for Atmel ARM processors
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+CPU_FAMILY = "at91"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.32"
+
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
+#PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-xorg"
+#PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+#XSERVER = "xserver-kdrive-fbdev"
+# Angstrom defines:
+#PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+#PREFERRED_VERSION_xserver-kdrive = "1.6.1"
+
+PREFERRED_PROVIDER_at91bootstrap = "at91bootstrap_2.13"
+PREFERRED_VERSION_at91bootstrap = "2.13"
+
+PREFERRED_PROVIDER_u-boot = "u-boot_2009.08"
+PREFERRED_VERSION_u-boot = "2009.08"
+
+KERNEL_IMAGETYPE = "uImage"
+
+# PREFERRED_VERSION_mplayer = "svn"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = " kernel26 alsa ext2 usbgadget vfat uboot "
+EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "at91bootstrap"
+
+MACHINE_EXTRA_RDEPENDS += " kernel-modules "
+#MACHINE_EXTRA_RDEPENDS += " atmel-fixes "
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+#
+# Uncomment or add kernel modules that should be autoloaded
+#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)}
+#module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)}
+module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)}
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index d4cacb9c44..a262059d45 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-arm926ejs.inc
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r30"
+MACHINE_KERNEL_PR = "r32"
TARGET_ARCH = "arm"
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 2d48c8b7d6..c3c59aa48b 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 = "r13"
+MACHINE_KERNEL_PR = "r14"
IMAGE_FSTYPES += "tar.gz ubi"
SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 9ff7b91ad9..dd1188b7c5 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
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 = "r50"
+MACHINE_KERNEL_PR = "r51"
KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cd83a7b5a6..02a48629c8 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer"
SERIAL_CONSOLE = "115200 ttyS0"
SERIAL_CONSOLE_collie = "115200 ttySA0"
+# FIXME: xserver-xorg is in testing
+
+# deprecated defaults
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# c7x0 uses kdrive-imageon (W100)
PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
+XSERVER_c7x0 = "xserver-kdrive-imageon"
+
+# collie uses kdrive-fbdev
PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
+XSERVER_collie = "xserver-kdrive-fbdev"
+
+# FIXME xserver-kdrive 1.3.0.0 is still the only working version ?
+PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300"
+XSERVER_akita = "xserver-kdrive-1300-fbdev"
+
+# spitz uses xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
+XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
PCMCIA_MANAGER ?= "pcmciautils"
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index c5249d94ef..f709f51c09 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -6,9 +6,16 @@ TARGET_ARCH = "sh3"
require conf/machine/include/tune-sh3.inc
+MACHINE_FEATURES = "kernel26 alsa pcmcia irda keyboard touchscreen screen vfat"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.17"
+PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.32"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+ xf86-input-evdev \
+ xf86-input-tslib \
+ xf86-video-fbdev"
-MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
PCMCIA_MANAGER = "pcmciautils" \ No newline at end of file
diff --git a/conf/machine/mtcdp-embedded.conf b/conf/machine/mtcdp-embedded.conf
new file mode 100644
index 0000000000..f571f2d8f0
--- /dev/null
+++ b/conf/machine/mtcdp-embedded.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Multi-Tech MTCDP Embedded
+#@DESCRIPTION: Machine configuration for the Embedded MTCDP (Cellular Development Platform)
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_mts-io ?= "0.4.1"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_MACHINE = "at91sam9g20ek_nandflash_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_VERSION_u-boot = "1.3.4"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/mtcdp.conf b/conf/machine/mtcdp.conf
new file mode 100644
index 0000000000..336e31b182
--- /dev/null
+++ b/conf/machine/mtcdp.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@Name: Multi-Tech MTCDP
+#@DESCRIPTION: Machine configuration for the MTCDP (Cellular Development Platform)
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PREFERRED_VERSION_linux = "2.6.32"
+PREFERRED_VERSION_mts-io ?= "0.4.1"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_MACHINE = "at91sam9g20ek_nandflash_config"
+
+PREFERRED_VERSION_at91bootstrap = "2.13"
+PREFERRED_VERSION_u-boot = "1.3.4"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 12cea679a8..ca4c050af3 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -52,7 +52,7 @@ USE_VT = "0"
# used by some images
ROOT_FLASH_SIZE = "256"
-IMAGE_FSTYPES += "tar.gz jffs2 ubifs ubi"
+IMAGE_FSTYPES += "tar.gz jffs2 ubi"
# extra jffs2 tweaks
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
@@ -71,14 +71,14 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
# UBI: logical eraseblock size: 129024 bytes
# from ubiattach stdout:
# UBI device number 0, total 1996 LEBs
-MKUBIFS_ARGS = "-m 2048 -e 129024 -c 2047"
+MKUBIFS_ARGS = "-m 2048 -e 126976 -c 2047"
# 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"
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048"
# build / upload tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
diff --git a/conf/machine/qemumips.conf b/conf/machine/qemumips.conf
index 27f96480b5..aa9c0cb2ed 100644
--- a/conf/machine/qemumips.conf
+++ b/conf/machine/qemumips.conf
@@ -7,8 +7,8 @@ TARGET_ARCH = "mips"
require conf/machine/include/qemu.inc
require conf/machine/include/tune-mips32.inc
-KERNEL_IMAGETYPE = "vmlinux.bin"
-
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_OUTPUT = "vmlinux"
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0d79977180..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216"
UBOOT_MACHINE = "akita_config"
UBOOT_ENTRYPOINT = "0xA1000000"
UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"