summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-30 22:07:04 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-06-30 22:07:04 +0000
commitd4f7af436d07c7bc4dd61ac45bff3414a1c12c74 (patch)
tree049f5903fea26153466932a6b271c49f10b75ba8 /conf
parent873ce28c40814edb45f534003450318c6e9b2650 (diff)
parent7339a83b4095582728045cee92aa215373607caf (diff)
merge of '08199c52a592fe71e2675200cf618a439d710884'
and '3e5f187370604cf4577025ebc49d90ca52a72d4d'
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini168
-rw-r--r--conf/distro/angstrom-2008.1.conf11
-rw-r--r--conf/distro/chinook-compat.conf13
-rw-r--r--conf/distro/ezx.conf82
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc21
-rw-r--r--conf/distro/include/angstrom-eglibc.inc2
-rw-r--r--conf/distro/include/angstrom.inc5
-rw-r--r--conf/distro/include/fso-autorev.inc3
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc78
-rw-r--r--conf/distro/include/preferred-xorg-versions-X11R7.4.inc167
-rw-r--r--conf/distro/include/sane-srcdates.inc4
-rw-r--r--conf/distro/include/sane-srcrevs.inc35
-rw-r--r--conf/distro/include/slugos.inc3
-rw-r--r--conf/distro/minimal-uclibc.conf (renamed from conf/distro/generic-uclibc.conf)6
-rw-r--r--conf/distro/minimal.conf (renamed from conf/distro/generic.conf)7
-rw-r--r--conf/distro/openmoko.conf1
-rw-r--r--conf/machine/beagleboard.conf7
-rw-r--r--conf/machine/davinci-dvevm.conf2
-rw-r--r--conf/machine/davinci-sffsdr.conf2
-rw-r--r--conf/machine/efika.conf2
-rw-r--r--conf/machine/hx4700.conf2
-rw-r--r--conf/machine/include/motorola-ezx-base.inc5
-rw-r--r--conf/machine/include/tune-cortexa8.inc2
-rw-r--r--conf/machine/include/tune-pentium.inc2
-rw-r--r--conf/machine/include/tune-pentiumpro.inc2
-rw-r--r--conf/machine/neuros-osd.conf5
-rw-r--r--conf/machine/neuros-osd2.conf28
-rw-r--r--conf/machine/om-gta01.conf2
-rw-r--r--conf/machine/om-gta02.conf2
-rw-r--r--conf/machine/omap3evm.conf32
-rw-r--r--conf/machine/xilinx-ml403.conf2
31 files changed, 461 insertions, 242 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 59a67cfe20..6c63dff5d7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1134,6 +1134,30 @@ sha256=926a9115e5c885ff9f2ef8abc6c3c552652afc370ebf65a87f41ec6810bdb569
md5=3cec33c3711860c4c6b7614afeec7870
sha256=9d7abee640dafbcdc6b75544015f3ffb5ed5aed2747465ec1412e959d3966740
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034]
+md5=7bc6c5b5f38b7027152f8db0458a2e14
+sha256=adc52e3427b606fe9649980b01c5b2b18f0509c4dd6d59a84f85b6a2989f9f8e
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035]
+md5=a2db61fe90e39371d0e6cd2285ec9208
+sha256=d3d906b23fce195d5d6f0db8969fa5264e80a98b5460008d6a05e4156ca73953
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036]
+md5=95c70c7ae9de5bd3659c86284be7fb76
+sha256=bdb24d65d1170234379fe587f5dc8b990c5e0c2d61c394bb8c81b91c1c64ce23
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037]
+md5=62b876a3d7cd192cc8db2476fbb6b7b9
+sha256=9688a352c0fb23d2ce6e685ce39cda1c49f4aa7819bde2508ff8c90003f484df
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038]
+md5=aca3afc341bd3e5a0d8a3b4ca40dbb3f
+sha256=0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039]
+md5=e240c34f979b64bcb83c5f6567110bb1
+sha256=46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
+
[http://bazaar.canonical.com/releases/src/bazaar_1.2.tar.gz]
md5=1fdb0aa41d7db06bf3429118d0136c8a
sha256=d1b657f52dea785ce1b1a8b5acfdee4492c5d779422f9b58e145162e2d33c241
@@ -1726,6 +1750,10 @@ sha256=c91699fe8cd2140e3b236257e7cb5ca4cd42e587a8f3eb932363f82f0e7212ef
md5=fb891b3da7eb921c09a5eb93e296f5e1
sha256=e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
+[http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
+md5=332edae079bb34d815369f4ba5181983
+sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
+
[http://www.chillispot.org/download/chillispot-0.98.tar.gz]
md5=4bcf48ec7a94f28faee8b7dc7a0dd97a
sha256=bace8a6a0b27d09983a2c509d6e6bf8ab786935e269036f14dc158505feba602
@@ -1818,6 +1846,10 @@ sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
md5=f5dd061c31765a49dc17ae8bdc986779
sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
+[http://www.cmake.org/files/v2.6/cmake-2.6.0.tar.gz]
+md5=e95ae003672dfc6c8151a1ee49a0d4a6
+sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
+
[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch]
md5=97cdbeb23bc8c8f4fe563d10a0c8c110
sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378
@@ -1894,6 +1926,10 @@ sha256=44549dcc5aa1aff1c62d0cf2a86412468f1498ecd3e846d278552ee50662242d
md5=dbcff54980ec6d6203c290dc409b5598
sha256=7ab8f1fa23a432029242c046755875ac6558ea6e9c0871dd6c527b85adfafad8
+[http://pimlico-project.org/sources/contacts/contacts-0.9.tar.gz]
+md5=aab5affbf93d6fa7b978b323a8d44de0
+sha256=9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d
+
[ftp://ftp.gnu.org/gnu/coreutils/coreutils-5.0.tar.gz]
md5=d16b769d380a0492a4c5ee61d2619985
sha256=c27ce75e3f62455f4facf4f3fd55bc9e3877d0ab1d5c0426c94da168cc349883
@@ -2194,6 +2230,10 @@ sha256=bc80a1933a77fc4cb47716d06aec3c2181976879ba771888af8b644086f24210
md5=0923d825a0aff2e4eb23338b630286fb
sha256=e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2
+[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.76.tar.gz]
+md5=d3b716a7e798faa1c6a867675f00306a
+sha256=8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3
+
[http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.71.tar.gz]
md5=ee893bc87b784a8c2285f5041b5e7033
sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
@@ -4122,6 +4162,14 @@ sha256=885b22a93b97116cd69824b91905dd909828943d78de069508a56cdf0d8d9203
md5=90fb4b7c74d29bb6ee5bd8de85942f42
sha256=cbb0e76c28a8b8ee93d49e1fea4cb31549904d95cd8f488309126f7f5046d616
+[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.3.tar.bz2]
+md5=71d9b7ec32a2a67854940a8848c2b229
+sha256=cc78e52e9afc3006e4d97bf1c4e232fa6253f8be15ee6ebb7272ce885213f34b
+
+[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.5.tar.bz2]
+md5=ebd3dc3ed4dffde781a2dc4eb4e39f3b
+sha256=cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
+
[http://ftp.5z.com/pub/gob/gob2-2.0.14.tar.gz]
md5=f8721af6f4e90ff48bd7cb4c96a5a94c
sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
@@ -4978,6 +5026,10 @@ sha256=4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152
md5=f1016148ecbfba968c0ef1773066988b
sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.8.tar.bz2]
+md5=090d87a1716eee45a9804ca8558668da
+sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de
+
[http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.4.tar.gz]
md5=7c60018e8b9ce7f62c7078bee5851f07
sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98
@@ -5486,6 +5538,10 @@ sha256=c231f87d4103293b119c3231574f67dcda29d383e0c0cbb420b4d10d7add4189
md5=e9ef4b8b78ab64cd7dbd0d41b05e932c
sha256=ed4f25e0da55714c618c2721209a2d22a7296b5dc85af028d20aff6062a4a13b
+[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r34.patch]
+md5=38e1ea5768cba4be72088a8a12d4b1af
+sha256=837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee
+
[http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r7.patch]
md5=059e56be476891e84715c897b5935431
sha256=e01b7efcfafa5c00cd1786d71b526f963dcd5129b518cab2b597d21c5d68eaa8
@@ -6862,6 +6918,10 @@ sha256=74c81e8c29de3fda2e196ce7082a5ec35aad9399a6c7f67bb906b3c9d91dc6f3
md5=493de1bfc84c1e0f82fd865795e48ffb
sha256=039861766d330b8ff2309334feb97d384e16d927dd859fdc0fad4c4a13d66b7c
+[http://downloads.sourceforge.net/libetpan/libetpan-0.54.tar.gz]
+md5=0214de45b1b92277fbfc6c9a00af5316
+sha256=f4547fae43a30265dd1d1e7f88c556d067a3ba67ca7ec0d46e540e6dc561a010
+
[http://monkey.org/~provos/libevent-1.1a.tar.gz]
md5=6cc776458ecaf9247550863702a44d7c
sha256=1725cd3dd9ec87a68316c36a50ab653c7e9581c91f9b1b7e9af42a9c7c499d8e
@@ -7514,10 +7574,30 @@ sha256=f9c803ba28d5deb18d9feb5c7818ce99325b09204b7dc0447798f2f47a657a46
md5=c685e69929333a763c51987b4a19d50d
sha256=5da9e72de291e7654fb59bf40b647633f3afb3cde924bd11b80d6ed26c911feb
+[http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw]
+md5=f563ce2543312937a9afb4f8445ef932
+sha256=3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc
+
+[http://opensync.org/download/releases/0.36/libopensync-0.36.tar.bz2]
+md5=d8cc7835663566e3626e959d8fb531bf
+sha256=c686d27f0818e2d8cc6277ba123c74d7210e70fa2b320c5a828eaaedd598e908
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-evolution2-0.36.tar.bz2]
+md5=ed3aca114a81ad8cc543b3dd68af657a
+sha256=19f1a24d54daec7b6e1321548799e500893b8aebe6dda995dc8eb162f77932c2
+
[http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-file-0.18.tar.gz]
md5=a9ffd002169406fb31eee885c9742c26
sha256=c03ad432d46e8f562ad4eaa08972c5bd229fdc45e5c01ac9af094cbfc38cdf59
+[http://opensync.org/download/releases/0.36/libopensync-plugin-file-0.36.tar.bz2]
+md5=785a79d70e3d6e0637c7f21b2a09987c
+sha256=932726d69b398686b9d6a1e2afd53c537c03ae8a476df1b8b00ba1f8b4abbf44
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-google-calendar-0.36.tar.bz2]
+md5=69b382845fb62a58e1976bc74a82dd86
+sha256=df3b64322b5f7e0e67317e58b46e9884837a771c69d9513dfb16dafeaeaaa2bb
+
[http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-gpe-0.18.tar.gz]
md5=6b35732f34aad4becfc24ee500d32c9b
sha256=218e8d5194d866109db3419c66d071cdbd319446288e7012ed135d4a6b8a3762
@@ -7526,6 +7606,30 @@ sha256=218e8d5194d866109db3419c66d071cdbd319446288e7012ed135d4a6b8a3762
md5=52f86db50d653f5af0adefeb76cf9a31
sha256=db7250647b86dc8d0bd45c73d454d73ca182c88f6ffe2ccf1760f40be81080f2
+[http://opensync.org/download/releases/0.36/libopensync-plugin-irmc-0.36.tar.bz2]
+md5=21f9789fa41c2f06c547a17bc13c6081
+sha256=f7ccff0bc136d3aa21ab961f31414f4856a94e9f1a1b17c44c8ec33b67ace4ac
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-moto-0.36.tar.bz2]
+md5=8dcecd4afb87e4645a152194fd3b5e55
+sha256=341c05e78a3254a979c073881cc1b2d3be3eb505a925dc99adc8124a4dd31bc7
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-palm-0.36.tar.bz2]
+md5=ee05ffadee75094d78a15e2704f5e64f
+sha256=e05b862d11af137e31f28279f7a6356d583cc4adb1293ffedfdcf86728882e52
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-python-0.36.tar.bz2]
+md5=6247a7e96de3fa55c1fb58b2f364fb5e
+sha256=9ecfa677d155a8e9e2674fabfa76adbeb45b887a321368cdab082618d27603a3
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-syncml-0.36.tar.bz2]
+md5=3c83493143fbfabf6600aea8d310167c
+sha256=d0db5ccdbf98012a9b70671c7b90cf8eed1f5133ac61563e97d7abf1533dc6e9
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-vformat-0.36.tar.bz2]
+md5=f3d1efdc1e7142fc74364e92f2066ee0
+sha256=926e6125b4be2d206c6618f8e9445a465df44fe013f23ec339679af307b342c9
+
[http://handhelds.org/packages/libosip/libosip-0.9.7-hh2.tar.gz]
md5=ffc20af80f77653ab534d2a103a2276d
sha256=b67c0218b7cd2d521783bf055b13c598bd04b623cbf4adbb3cc76bd3ac57dc5d
@@ -7762,6 +7866,10 @@ sha256=a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c
md5=a6b5becd4b61e246ed2ee95db9f6e746
sha256=2be78a947bdbfd24aa4f35ae97d2b7bafa60162c5e824cf3dd085b40eddee8ff
+[http://libsyncml.opensync.org/download/releases/0.4.6/libsyncml-0.4.6.tar.bz2]
+md5=d524b18c1eafe5805f83e29c01a91b66
+sha256=818740eb5df3cf7913ab7e7979874ccf403831744c89efa4ebaf74c7e2c090bc
+
[http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.0.55.tar.gz]
md5=2cbbbeaf97c154a7fb9b088b95deb70e
sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35
@@ -8122,6 +8230,10 @@ sha256=ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
md5=296a6d150d260144639c3664d127d174
sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2]
+md5=ca0ce8f288e8ae93ac243b568f906bf8
+sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b
+
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2]
md5=443c265b57e87eadc0c677c3acc37e20
sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58
@@ -8134,10 +8246,18 @@ sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
md5=1b515f588078dfa7f4bab2634bd17e80
sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942
+[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.19.tar.bz2]
+md5=4db27facb78aeb79d06e6ae6bf0ac0b6
+sha256=9879bb214a12b15a6a589fe15c2acad3177b3a49fd03a26e79ae558755e98a4b
+
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.5.tar.bz2]
md5=f36616d74f2fde72040bccf50db03522
sha256=7904cd53bf681611dff65d04afcdab6205f6e06cb0c40a568174d83a3a5d8a01
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.6.tar.bz2]
+md5=20af4d1e05bd725e89b691da483276e9
+sha256=914424a9ae14cf6fa2debbfed327e071b43b06daf5085282cdb133a02fab1ca3
+
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
md5=2e230d005c002fb3d38a3ca07c0200d0
sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
@@ -8170,6 +8290,10 @@ sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
md5=3f23ad4b69d0a552042d1ed0f4399857
sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2]
+md5=db95a49a656a3247d4995a797d333153
+sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
+
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
md5=e921200f074ca97184e150ef5a4af825
sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -8182,6 +8306,10 @@ sha256=a812816ee1742bf3bf8977a391b369a7351f54a1917dc90b27e666679dd1742a
md5=f1fc22939d71224923f168ba179b3e51
sha256=35b9045edc5992c2d168fc72ca04a57f4e1c81a0ea987fa88342e54f7c79fbd4
+[http://www.omapzoom.org/pub/kernel/linux-ldp-v1.2.tar.gz]
+md5=8f22aa4396711f7a7791886bcd623749
+sha256=01f083599014e22ee2ca4894dbe96dd103b7be9d3796b7e075b040a5c324704d
+
[http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.11.1.tar.bz2]
md5=1df3e4fbf2670712cecb4953e2d24834
sha256=8dffedf772a9f75a8cee2a603e1b14e4b7848010dcfa0e6b087afcf4f66da6de
@@ -8274,6 +8402,10 @@ sha256=2f6d619ebbab25f5b5091555f96dc29159fa3c214d1c5fdc5673af97515d18e6
md5=6c0d60bcc357365af056baa812c45960
sha256=830ef8c4b65ed34954afc2581447fd0a9afcf5f9de354772352c8da54dceb676
+[http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r2.patch]
+md5=c51ae4d5fa800ec81660fdf5b776fae6
+sha256=af92b078cb52f9c58964d49b074a5d09de601435c8e84cec817b636fc53c8eeb
+
[http://www.rpsys.net/openzaurus/patches/archive/locomo_led_default_trigger-r0.patch]
md5=38ac643c7e12b808a7f4463ef862aee1
sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53
@@ -9102,6 +9234,10 @@ sha256=30261e2f1ab064e089784578e0c63f31d5696a198db5f6ec793776ce70ccddb3
md5=900be0beea498b18f03e2d67656d9d32
sha256=f03c69e064f1269dfd5adbc668204d0a7e0eafb86317e293e9d6c1ce0a4f5761
+[http://www.opensync.org/download/releases/0.36/msynctool-0.36.tar.bz2]
+md5=9ef1c03d1e087493dbca67dabb612e6b
+sha256=de08e22708348216e0e1ea3c32b4cf0c04d5acae5057b5995fc087790f0ae1a5
+
[http://downloads.sourceforge.net/mt-daapd/mt-daapd-0.2.1.1.tar.gz]
md5=87356d2750ad82388a58d901aa566465
sha256=92d9abd2d0cabaea198b9434100ebf1d5524283de8df02b0f04d907b2274959b
@@ -9514,6 +9650,10 @@ sha256=d35213dc854f1e1a08512154c7a92fb94d9f0506cc5107f8b2f248412679fb53
md5=f5f83204652627cf51d2567c53df5520
sha256=62d36b998b9ec21864263d17e83aeb30a300a8f0d336a057ca9610b447b9ce7a
+[http://www.openswan.org/download/old/openswan-2.4.7.tar.gz]
+md5=70f22e8adc39e07a165f75eccb7cd079
+sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
+
[http://www.openswan.org/download/openswan-2.4.7.tar.gz]
md5=70f22e8adc39e07a165f75eccb7cd079
sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
@@ -9870,6 +10010,10 @@ sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
md5=527687c63f4252989dba6fb92baf9707
sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.26-rc4.bz2]
+md5=b5f96d823b1183ba0c4e61516e1a23c0
+sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
+
[http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
md5=d6249654087f0bcafaa860ac573316a4
sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -10122,6 +10266,10 @@ sha256=a5781c8a4c0c71224b23f1c4155609baeee0eca8ce7cd34c1c969a65d6c6bab2
md5=3ed63ce3884d6cdd71b6d471e3c49407
sha256=e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41
+[http://www.rpsys.net/openzaurus/patches/archive/poodle_pm-r6.patch]
+md5=e897eb0dc64c2862091f97e20f580de6
+sha256=66283a36122d77a4118a1b2e48af92c03ae09b3e53fe7875e7fe3db1486a522c
+
[http://www.rpsys.net/openzaurus/patches/archive/poodle_ssp-r1.patch]
md5=8efe67bc46564512bd1de09fce5971ab
sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
@@ -10330,6 +10478,10 @@ sha256=2f18dc8e553b2eb9e40e429ccc829e2b8e25d2f82929cfbc4149b1147d00eee1
md5=9cb4a25331a4c4db866a31cbe507c793
sha256=72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.10.tar.gz]
+md5=9187ac1b302b9ab45f355242f453882e
+sha256=1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975
+
[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
md5=99b5d9efd4fce35cabb4ae5d0ebb230d
sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
@@ -10474,6 +10626,10 @@ sha256=f6dc5a05456a6d4abb9e8b80df70aefac6f8764d04e079aa4c4c5b45cd0ff9bc
md5=4f41fd3a0e031a26d3a2d354f5995ffd
sha256=3959a45bb65f66a622d7752e41808604032f4ab66f736f96fee83e252d85df5a
+[http://www.rpsys.net/openzaurus/patches/archive/pxa_keys-r9.patch]
+md5=c1358d4c210d1d701b5b0d96d8e73c12
+sha256=8697e76beb6ea44ce450e8cb9bed764803fe189eaea89e0aa72ebd1974bc52e4
+
[http://www.rpsys.net/openzaurus/patches/archive/pxa_timerfix-r0.patch]
md5=69e6907a10d88362d6cf4fd2e806ab42
sha256=c7d82fbe1d008edfb5ae53879de24bb882b2cdbd9ee9aab67389910da499210e
@@ -12178,6 +12334,10 @@ sha256=c2bed5d4ec064e0ac9c73c046e545dfad5ebfce3c84bdade1323a9f7a5265056
md5=95e9a5dfc1852e2db3d1d9da6df439df
sha256=83097559d413b57aa67da1de975e8fbb99d02a2b2166aad57d7b30881208ff1e
+[http://www.rpsys.net/openzaurus/patches/archive/tsc2101-r19.patch]
+md5=c70fa3e0184842e4f6822b7002eac33e
+sha256=7ca39d0df0a102114eabcd39df94ff271d81a71d9ef9f61915ac0a04031b68d1
+
[http://repository.maemo.org/pool/maemo/ossw/source/t/tscalib/tscalib_0.0.1-3.tar.gz]
md5=a06f80dfda9688e033561f959aae2d5e
sha256=b27add2e28f38feea0c554633f220cd7542a8bb768ba290636a317852774ecbb
@@ -12538,6 +12698,10 @@ sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
md5=1c26f40af343bcc465f5832e2c9548d6
sha256=bf0ca221bc5e8a6b06f73a1eb6ae1470ec5b34b987669f7abeb499e6402af3b0
+[http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.5.tar.bz2]
+md5=81ae073aa38317acdd4c5ecdc15da386
+sha256=8c8db0b6de0bae2c065a68d31369e750dc03bd875bac78e87763e263f3bc2588
+
[http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz]
md5=5ec548c343de435b94a7b39f5c853292
sha256=10263676cb872ca48d8d605be44eb1e6260419675409732e7e5a76eb41843cee
@@ -14698,7 +14862,3 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3
md5=a6538f6c44ceeed0ed7e8e356f444168
sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
-[http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
-md5=332edae079bb34d815369f4ba5181983
-sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
-
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 17029ec21e..d6354411fd 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -90,13 +90,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1"
#for proper NEON support we need a CSL toolchain
-ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
+#ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
+ANGSTROM_GCC_VERSION_armv7a = "4.3.1"
+
+#Horrible workaround for armv7a follows:
+# gcc 4.3.1 builds a kernel that oopses with a null-pointer in the rcu-update function
+# gcc 4.2.1 (the one from *gasp* csl) builds a working kernel, but non-working userspace
+
+KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
#avr32 only has support for gcc 4.2.2
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
#Everybody else can just use this:
-ANGSTROM_GCC_VERSION ?= "4.2.2"
+ANGSTROM_GCC_VERSION ?= "4.2.4"
PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index e834c8c4c8..f6029eed1b 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -52,7 +52,9 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
PREFERRED_VERSION_automake-native = "1.9.6"
@@ -84,6 +86,9 @@ PREFERRED_VERSION_glib-2.0 = "2.12.12"
PREFERRED_VERSION_pango = "1.16.4"
PREFERRED_VERSION_atk = "1.18.0"
PREFERRED_VERSION_gtk+ = "2.10.14"
+PREFERRED_VERSION_libpng = "1.2.8"
+PREFERRED_VERSION_dbus = "1.0.3"
+PREFERRED_VERSION_expat = "1.95.7"
PREFERRED_VERSION_gnome-vfs = "2.16.3"
@@ -112,6 +117,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb"
PREFERRED_VERSION_libsdl-directfb = "1.2.9"
PREFERRED_VERSION_libsdl-image = "1.2.3"
+PREFERRED_VERSION_libsdl-mixer = "1.2.6"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -137,7 +143,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm = "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm = "gtk+"
-PREFERRED_PROVIDER_gconf = "gconf"
+PREFERRED_PROVIDER_gconf = "gconf-dbus"
PREFERRED_VERSION_pixman = "0.9.6"
@@ -169,7 +175,7 @@ PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97.1"
+PREFERRED_VERSION_classpath = "0.97.2"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -192,6 +198,7 @@ PKG_glib-2.0 = "libglib2.0-0"
PKG_gconf = "libgconf2-6"
DEBIANNAME_dbus_pn-dbus = "dbus"
PKG_libhildon = "libhildon1"
+DEBIANNAME_eds-dbus_pn-libedataserver-1.2 = "libedataserver"
PKG_zlib = "zlib1g"
PKG_libglade = "libglade2-0"
diff --git a/conf/distro/ezx.conf b/conf/distro/ezx.conf
deleted file mode 100644
index 5b12b6f93b..0000000000
--- a/conf/distro/ezx.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#@--------------------------------------------------------------------
-#@TYPE: Distribution
-#@NAME: EZX <http://www.openezx.org>
-#@DESCRIPTION: A Linux Distribution for Motorola GSM phones
-#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de>
-#@--------------------------------------------------------------------
-
-DISTRO_NAME = "OpenEZX"
-DISTRO_VERSION = ".dev-snapshot-${DATE}"
-DISTRO_TYPE = "debug"
-# DISTRO_TYPE = "release"
-
-INHERIT += " package_ipk debian"
-
-# libc setting:
-# specify whether you want a glibc or uclibc based distribution
-#TARGET_OS = "linux-uclibc"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-#FEED_URIS += " \
-# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
-#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
-# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
-# base##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/base/ \
-# libs##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/libs/ \
-# console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \
-# devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel"
-
-SRCDATE ?= "20060507"
-
-PREFERRED_PROVIDER_hostap-conf = "hostap-conf"
-
-KERNEL_CONSOLE = "ttyS0"
-#DEBUG_OPTIMIZATION = "-O -g3"
-#DEBUG_BUILD = "1"
-#INHIBIT_PACKAGE_STRIP = "1"
-
-# fix some iconv issues, needs to be commented out when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Base
-#
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
-
-# ezx-kernel has problems with newer g++ atm.
-PREFERRED_VERSION_gcc ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross ?= "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
-PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
-PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
-
-#
-# Utilities
-#
-EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
-BOOTSTRAP_EXTRA_RDEPENDS += "ezx-gpiotool strace"
-
-#
-# Opie
-#
-QTE_VERSION = "2.3.10"
-OPIE_VERSION = "1.2.2"
-PALMTOP_USE_MULTITHREADED_QT = "yes"
-require conf/distro/include/preferred-opie-versions.inc
-
-#
-# GPE
-#
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-require conf/distro/include/preferred-gpe-versions-2.8.inc
-
-#
-# E
-#
-require conf/distro/include/preferred-e-versions.inc
-
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 382d562426..7707215847 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,10 +1,23 @@
+PREFERRED_VERSION_automake-native = "1.10"
PREFERRED_VERSION_busybox = "1.9.2"
+PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
-PREFERRED_VERSION_glib-2.0 = "2.16.1"
+PREFERRED_VERSION_dropbear = "0.51"
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_glib-2.0 = "2.16.3"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libtool = "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross = "2.2.4"
+PREFERRED_VERSION_libtool-sdk = "2.2.4"
PREFERRED_VERSION_pango = "1.18.3"
-PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_pixman = "0.10.0"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.10"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_dropbear = "0.50"
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index 394ec7c2d4..07873fe700 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -14,6 +14,8 @@ PREFERRED_PROVIDER_virtual/sparc${TARGET_VENDOR}-linux-libc-for-gcc = "
TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+#TARGET_OS = "linux-gnuspe"
+
#mess with compiler flags to use -Os instead of -O2
#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
# perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index bd56a09de6..bbdbe7f80b 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -281,9 +281,10 @@ TINDER_CLOBBER = "1"
TINDER_REPORT = "1"
# Configuration for seppuku autobuilder, people only need to put:
-# INHERIT += "seppuku"
+# INHERIT += "seppuku oestats-client"
# SEPPUKU_USER = "your_bugzilla@user.id"
# SEPPUKU_PASS = "your_bugzilla_password"
+# OESTATS_BUILDER = "your_name"
# in their local.conf
# seppuku bbclass
@@ -297,7 +298,7 @@ SEPPUKU_AUTOBUILD = "1"
SEPPUKU_PRODUCT = "Openembedded"
SEPPUKU_COMPONENT = "org.openembedded.dev"
-
+OESTATS_SERVER ?= "tinderbox.openembedded.net"
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index df53515a9a..da6dafd6bc 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -1,9 +1,12 @@
+SRCREV_pn-frameworkd = "${AUTOREV}"
SRCREV_pn-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-gsmd2 = "${AUTOREV}"
SRCREV_pn-pygsm = "${AUTOREV}"
SRCREV_pn-mickeyterm = "${AUTOREV}"
SRCREV_pn-pyneod = "${AUTOREV}"
SRCREV_pn-pynoeg = "${AUTOREV}"
SRCREV_pn-python-odeviced = "${AUTOREV}"
+SRCREV_pn-python-oeventd = "${AUTOREV}"
SRCREV_pn-python-ophoned = "${AUTOREV}"
SRCREV_pn-python-ousaged = "${AUTOREV}"
SRCREV_pn-python-pytrc = "${AUTOREV}"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 99f0390dee..a9fbb3067d 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -59,7 +59,7 @@ PREFERRED_VERSION_autofs ?= "4.1.4"
PREFERRED_VERSION_automake ?= "1.9.6"
PREFERRED_VERSION_automake-native ?= "1.9.6"
PREFERRED_VERSION_avahi ?= "0.6.22"
-PREFERRED_VERSION_avahi-python ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
PREFERRED_VERSION_avahi-ui ?= "0.6.22"
PREFERRED_VERSION_avetanabt ?= "20060413"
PREFERRED_VERSION_bacula-client ?= "1.38.11"
@@ -117,7 +117,7 @@ PREFERRED_VERSION_btscanner ?= "2.0"
PREFERRED_VERSION_btsco ?= "0.42"
PREFERRED_VERSION_btsco-module ?= "0.42"
PREFERRED_VERSION_btxml ?= "1.0"
-PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_busybox-static ?= "1.2.1"
PREFERRED_VERSION_bvi ?= "1.3.1"
PREFERRED_VERSION_bwmon ?= "1.3"
@@ -162,10 +162,10 @@ PREFERRED_VERSION_chrpath-native ?= "0.13"
PREFERRED_VERSION_ckermit ?= "211"
PREFERRED_VERSION_clamav ?= "0.91.1"
PREFERRED_VERSION_clamsmtp ?= "1.8"
-PREFERRED_VERSION_classpath ?= "0.97.1"
-PREFERRED_VERSION_classpath-gtk ?= "0.97.1"
-PREFERRED_VERSION_classpath-minimal ?= "0.97.1"
-PREFERRED_VERSION_classpath-native ?= "0.97.1"
+PREFERRED_VERSION_classpath ?= "0.97.2"
+PREFERRED_VERSION_classpath-gtk ?= "0.97.2"
+PREFERRED_VERSION_classpath-minimal ?= "0.97.2"
+PREFERRED_VERSION_classpath-native ?= "0.96.1"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"
PREFERRED_VERSION_cmake-native ?= "2.4.7"
@@ -201,8 +201,8 @@ PREFERRED_VERSION_ctorrent ?= "1.3.4"
PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
PREFERRED_VERSION_cumulus ?= "1.2.1"
PREFERRED_VERSION_cups ?= "1.2.12"
-PREFERRED_VERSION_curl ?= "7.16.4"
-PREFERRED_VERSION_curl-native ?= "7.16.4"
+PREFERRED_VERSION_curl ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.0"
PREFERRED_VERSION_custominput ?= "1.1.0"
PREFERRED_VERSION_cvs ?= "1.12.9"
PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -221,6 +221,7 @@ PREFERRED_VERSION_dbench ?= "4.0"
PREFERRED_VERSION_dbh ?= "1.0-18"
PREFERRED_VERSION_db-native ?= "4.3.29"
PREFERRED_VERSION_dbus ?= "1.2.1"
+PREFERRED_VERSION_dbus-native ?= "1.2.1"
PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_dbus-glib-native ?= "0.74"
PREFERRED_VERSION_dbus-native ?= "1.0.3"
@@ -272,7 +273,7 @@ PREFERRED_VERSION_dpkg ?= "1.13.25"
PREFERRED_VERSION_dpkg-native ?= "1.13.25"
PREFERRED_VERSION_driftnet ?= "0.1.6"
PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
-PREFERRED_VERSION_dropbear ?= "0.49"
+PREFERRED_VERSION_dropbear ?= "0.51"
PREFERRED_VERSION_dsniff ?= "2.3"
PREFERRED_VERSION_duma ?= "2.5.7"
PREFERRED_VERSION_dvb-image ?= "1.0"
@@ -465,7 +466,7 @@ PREFERRED_VERSION_gkrellm ?= "2.2.10"
PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
-PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
PREFERRED_VERSION_glibc ?= "2.6.1"
PREFERRED_VERSION_glibc-initial ?= "2.6.1"
PREFERRED_VERSION_glibmm ?= "2.12.10"
@@ -476,9 +477,9 @@ PREFERRED_VERSION_glrr ?= "20050529"
PREFERRED_VERSION_glrr-widgets ?= "20050529"
PREFERRED_VERSION_glurp ?= "0.11.3"
PREFERRED_VERSION_gmailfs ?= "0.7.3"
-PREFERRED_VERSION_gmp ?= "4.2.1"
+PREFERRED_VERSION_gmp ?= "4.2.2"
PREFERRED_VERSION_gmpc ?= "0.13.0"
-PREFERRED_VERSION_gmp-native ?= "4.2.1"
+PREFERRED_VERSION_gmp-native ?= "4.2.2"
PREFERRED_VERSION_gnash ?= "0.8.2"
PREFERRED_VERSION_gnocky ?= "0.0.3"
PREFERRED_VERSION_gnokii ?= "0.6.14"
@@ -606,7 +607,7 @@ PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
PREFERRED_VERSION_gspcav1 ?= "20070110"
PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2"
PREFERRED_VERSION_gst-meta-base ?= "0.10"
-PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.4"
+PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7"
PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6"
PREFERRED_VERSION_gst-plugins-base ?= "0.10.17"
PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1"
@@ -1226,16 +1227,28 @@ PREFERRED_VERSION_microcom ?= "1.02"
PREFERRED_VERSION_micro-emacs ?= "20060909"
PREFERRED_VERSION_microwindows ?= "0.90"
PREFERRED_VERSION_midori ?= "0.0.17"
-PREFERRED_VERSION_midpath ?= "0.1"
-PREFERRED_VERSION_midpath-alsa ?= "0.1"
-PREFERRED_VERSION_midpath-cldc ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-native ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-sdl ?= "0.1"
-PREFERRED_VERSION_midpath-cldc-x11 ?= "0.1"
-PREFERRED_VERSION_midpath-gtk ?= "0.1"
-PREFERRED_VERSION_midpath-qt3x11 ?= "0.1"
-PREFERRED_VERSION_midpath-qte ?= "0.1"
-PREFERRED_VERSION_midpath-test ?= "0.1"
+PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc1"
+PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc1"
PREFERRED_VERSION_mikmod ?= "3.2.2-beta1"
PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814"
PREFERRED_VERSION_militaryalphabet ?= "0.2.1"
@@ -1296,7 +1309,7 @@ PREFERRED_VERSION_mythfront-config ?= "1.10"
PREFERRED_VERSION_mythfront-session ?= "1.5"
PREFERRED_VERSION_nabi ?= "0.17"
PREFERRED_VERSION_nail ?= "11.21"
-PREFERRED_VERSION_nano ?= "2.0.6"
+PREFERRED_VERSION_nano ?= "2.0.7"
PREFERRED_VERSION_nasm-native ?= "0.98.38"
PREFERRED_VERSION_nautilus ?= "2.12.2"
PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
@@ -1344,7 +1357,6 @@ PREFERRED_VERSION_obexpush ?= "1.0.0"
PREFERRED_VERSION_obexpush-native ?= "1.0.0"
PREFERRED_VERSION_octave ?= "2.1.73"
PREFERRED_VERSION_offlineimap ?= "4.0.14"
-PREFERRED_VERSION_olsr ?= "0.3-1"
PREFERRED_VERSION_olsrd ?= "0.5.3"
PREFERRED_VERSION_omext ?= "0.2"
PREFERRED_VERSION_omniorb ?= "4.0.7"
@@ -1368,6 +1380,8 @@ PREFERRED_VERSION_openssl-native ?= "0.9.7g"
PREFERRED_VERSION_openswan ?= "2.4.7"
PREFERRED_VERSION_openttd ?= "0.4.0.1"
PREFERRED_VERSION_openvpn ?= "2.0.9"
+SRCREV_pn-opkg-native ?= "4488"
+SRCREV_pn-opkg ?= "4488"
PREFERRED_VERSION_oplinux-packages ?= "1.0"
PREFERRED_VERSION_oprofile ?= "0.9.3"
PREFERRED_VERSION_orage ?= "4.4.1"
@@ -1475,7 +1489,7 @@ PREFERRED_VERSION_proj-4-native ?= "4.9"
PREFERRED_VERSION_psmisc ?= "22.2"
PREFERRED_VERSION_psplash-zap ?= "1.0"
PREFERRED_VERSION_pth ?= "2.0.2"
-PREFERRED_VERSION_pulseaudio ?= "0.9.9"
+PREFERRED_VERSION_pulseaudio ?= "0.9.10"
PREFERRED_VERSION_puppy ?= "1.11"
PREFERRED_VERSION_puzz-le ?= "2.0.0"
PREFERRED_VERSION_puzzles ?= "r7436"
@@ -1499,7 +1513,7 @@ PREFERRED_VERSION_python-fpconst ?= "0.6.0"
PREFERRED_VERSION_python-gammu ?= "0.24"
PREFERRED_VERSION_python-gmpy ?= "1.0.1"
PREFERRED_VERSION_python-gnosis ?= "1.2.2"
-PREFERRED_VERSION_python-gst ?= "0.10.8"
+PREFERRED_VERSION_python-gst ?= "0.10.10"
PREFERRED_VERSION_python-hmm ?= "0.4"
PREFERRED_VERSION_python-imaging ?= "1.1.6"
PREFERRED_VERSION_python-imdbpy ?= "3.1"
@@ -1527,8 +1541,8 @@ PREFERRED_VERSION_python-pyfits ?= "1.1"
PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
PREFERRED_VERSION_python-pygame ?= "1.7.1"
PREFERRED_VERSION_python-pygnome ?= "2.16.2"
-PREFERRED_VERSION_python-pygobject ?= "2.12.3"
-PREFERRED_VERSION_python-pygobject-native ?= "2.12.3"
+PREFERRED_VERSION_python-pygobject ?= "2.14.2"
+PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
PREFERRED_VERSION_python-pygoogle ?= "0.6"
PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
PREFERRED_VERSION_python-pygtk ?= "2.10.4"
@@ -1879,7 +1893,7 @@ PREFERRED_VERSION_ubahnnav ?= "0.4.1"
PREFERRED_VERSION_u-boot ?= "1.2.0"
PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "118"
+PREFERRED_VERSION_udev ?= "115"
PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
PREFERRED_VERSION_udhcp ?= "0.9.8"
PREFERRED_VERSION_ufraw ?= "0.12"
@@ -1958,9 +1972,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
PREFERRED_VERSION_wmctrl ?= "1.07"
PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
-PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
-PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.10"
PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
PREFERRED_VERSION_wrt-init ?= "1.0"
PREFERRED_VERSION_wrt-utils ?= "1.0"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
index d81067302e..d6cdc13d5d 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc
@@ -40,58 +40,60 @@ PREFERRED_VERSION_bdftopcf ?= "1.0.1"
PREFERRED_VERSION_beforelight ?= "1.0.3"
PREFERRED_VERSION_bitmap ?= "1.0.3"
PREFERRED_VERSION_editres ?= "1.0.3"
-PREFERRED_VERSION_fontosfnt ?= "1.0.3"
-PREFERRED_VERSION_fslsfonts ?= "1.0.1"
-PREFERRED_VERSION_fstobdf ?= "1.0.2"
+PREFERRED_VERSION_fontosfnt ?= "1.0.4"
+PREFERRED_VERSION_fslsfonts ?= "1.0.2"
+PREFERRED_VERSION_fstobdf ?= "1.0.3"
PREFERRED_VERSION_iceauth ?= "1.0.2"
PREFERRED_VERSION_ico ?= "1.0.2"
PREFERRED_VERSION_lbxproxy ?= "1.0.1"
PREFERRED_VERSION_listres ?= "1.0.1"
PREFERRED_VERSION_luit ?= "1.0.3"
-PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
-PREFERRED_VERSION_mkfontdir ?= "1.0.3"
-PREFERRED_VERSION_mkfontscale ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.4"
+PREFERRED_VERSION_mkfontdir ?= "1.0.4"
+PREFERRED_VERSION_mkfontscale ?= "1.0.5"
PREFERRED_VERSION_oclock ?= "1.0.1"
PREFERRED_VERSION_proxymngr ?= "1.0.1"
-PREFERRED_VERSION_rgb ?= "1.0.1"
+PREFERRED_VERSION_rgb ?= "1.0.3"
PREFERRED_VERSION_rstart ?= "1.0.2"
PREFERRED_VERSION_scripts ?= "1.0.1"
PREFERRED_VERSION_sessreg ?= "1.0.3"
PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_showfont ?= "1.0.2"
PREFERRED_VERSION_smproxy ?= "1.0.2"
-PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_twm ?= "1.0.4"
PREFERRED_VERSION_viewres ?= "1.0.1"
-PREFERRED_VERSION_x11perf ?= "1.4.1"
-PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_x11perf ?= "1.5"
+PREFERRED_VERSION_xauth ?= "1.0.3"
PREFERRED_VERSION_xbacklight ?= "1.1"
PREFERRED_VERSION_xbiff ?= "1.0.1"
PREFERRED_VERSION_xcalc ?= "1.0.2"
PREFERRED_VERSION_xclipboard ?= "1.0.1"
PREFERRED_VERSION_xclock ?= "1.0.3"
+PREFERRED_VERSION_xcompmgr ?= "1.1.4"
PREFERRED_VERSION_xcmsdb ?= "1.0.1"
PREFERRED_VERSION_xconsole ?= "1.0.3"
PREFERRED_VERSION_xcursorgen ?= "1.0.2"
PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
PREFERRED_VERSION_xditview ?= "1.0.1"
-PREFERRED_VERSION_xdm ?= "1.1.6"
-PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xdm ?= "1.1.8"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.3"
PREFERRED_VERSION_xdriinfo ?= "1.0.2"
PREFERRED_VERSION_xedit ?= "1.0.2"
-PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xev ?= "1.0.3"
PREFERRED_VERSION_xeyes ?= "1.0.1"
PREFERRED_VERSION_xxf86dga ?= "1.0.2"
PREFERRED_VERSION_xfd ?= "1.0.1"
PREFERRED_VERSION_xfindproxy ?= "1.0.1"
PREFERRED_VERSION_xfontsel ?= "1.0.2"
-PREFERRED_VERSION_xfs ?= "1.0.5"
-PREFERRED_VERSION_xfsinfo ?= "1.0.1"
+PREFERRED_VERSION_xfs ?= "1.0.8"
+PREFERRED_VERSION_xfsinfo ?= "1.0.2"
PREFERRED_VERSION_xfwp ?= "1.0.1"
PREFERRED_VERSION_xgamma ?= "1.0.2"
PREFERRED_VERSION_xgc ?= "1.0.1"
PREFERRED_VERSION_xhost ?= "1.0.2"
-PREFERRED_VERSION_xinit ?= "1.0.7"
+PREFERRED_VERSION_xinit ?= "1.0.9"
PREFERRED_VERSION_xinput ?= "1.3.0"
-PREFERRED_VERSION_xkbcomp ?= "1.0.3"
+PREFERRED_VERSION_xkbcomp ?= "1.0.5"
PREFERRED_VERSION_xkbevd ?= "1.0.2"
PREFERRED_VERSION_xkbprint ?= "1.0.1"
PREFERRED_VERSION_xkbutils ?= "1.0.1"
@@ -111,12 +113,12 @@ PREFERRED_VERSION_xphelloworld ?= "1.0.1"
PREFERRED_VERSION_xplsprinters ?= "1.0.1"
PREFERRED_VERSION_xpr ?= "1.0.2"
PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1"
-PREFERRED_VERSION_xprop ?= "1.0.3"
-PREFERRED_VERSION_xrandr ?= "1.2.2"
-PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xprop ?= "1.0.4"
+PREFERRED_VERSION_xrandr ?= "1.2.3"
+PREFERRED_VERSION_xrdb ?= "1.0.5"
PREFERRED_VERSION_xrefresh ?= "1.0.2"
PREFERRED_VERSION_xrx ?= "1.0.1"
-PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xset ?= "1.0.4"
PREFERRED_VERSION_xsetmode ?= "1.0.0"
PREFERRED_VERSION_xsetpointer ?= "1.0.1"
PREFERRED_VERSION_xsetroot ?= "1.0.2"
@@ -139,62 +141,63 @@ PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
# driver
PREFERRED_VERSION_xf86-input-acecad ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1"
-PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-aiptek ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.2"
PREFERRED_VERSION_xf86-input-citron ?= "2.2.1"
-PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0"
-PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2"
+PREFERRED_VERSION_xf86-input-elographics ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.99.4"
+PREFERRED_VERSION_xf86-input-fpit ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-hyperpen ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0"
PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1"
-PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
-PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1"
+PREFERRED_VERSION_xf86-input-magellan ?= "1.2.0"
PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5"
-PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3"
-PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1"
+PREFERRED_VERSION_xf86-input-microtouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0"
+PREFERRED_VERSION_xf86-input-mutouch ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.3.0"
PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1"
-PREFERRED_VERSION_xf86-input-summa ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0"
+PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
+PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.5.1"
PREFERRED_VERSION_xf86-input-void ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-apm ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-ark ?= "0.6.0"
-PREFERRED_VERSION_xf86-video-ast ?= "0.81.0"
+PREFERRED_VERSION_xf86-video-apm ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-ark ?= "0.7.0"
+PREFERRED_VERSION_xf86-video-ast ?= "0.85.0"
PREFERRED_VERSION_xf86-video-ati ?= "6.8.0"
-PREFERRED_VERSION_xf86-video-chips ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-chips ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1"
PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0"
-PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0"
+PREFERRED_VERSION_xf86-video-geode ?= "2.9.0"
PREFERRED_VERSION_xf86-video-glide ?= "1.0.0"
-PREFERRED_VERSION_xf86-video-glint ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
-PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0"
+PREFERRED_VERSION_xf86-video-glint ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-i740 ?= "1.2.0"
PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
PREFERRED_VERSION_xf86-video-intel ?= "2.2.1"
PREFERRED_VERSION_xf86-video-mga ?= "1.4.8"
-PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.1"
PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3"
-PREFERRED_VERSION_xf86-video-nv ?= "2.1.7"
-PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3"
-PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
-PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1"
-PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
-PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2"
-PREFERRED_VERSION_xf86-video-sis ?= "0.9.4"
-PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.9"
+PREFERRED_VERSION_xf86-video-radeonhd ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-rendition ?= "4.2.0"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.6.0"
+PREFERRED_VERSION_xf86-video-s3virge ?= "1.10.1"
+PREFERRED_VERSION_xf86-video-savage ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.6.0"
+PREFERRED_VERSION_xf86-video-sis ?= "0.10.0"
+PREFERRED_VERSION_xf86-video-sisusb ?= "0.9.0"
PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0"
PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0"
PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0"
@@ -202,32 +205,35 @@ PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0"
PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0"
PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0"
PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.4.0"
PREFERRED_VERSION_xf86-video-tga ?= "1.1.0"
-PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
-PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
-PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1"
+PREFERRED_VERSION_xf86-video-trident ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0"
PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.15.2"
-PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.1"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.0"
+PREFERRED_VERSION_xf86-video-xgixp ?= "1.7.99.3"
# font
PREFERRED_VERSION_encodings ?= "1.0.2"
PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1"
PREFERRED_VERSION_font-util-native ?= "1.0.1"
PREFERRED_VERSION_font-util ?= "1.0.1"
+PREFERRED_VERSION_font-xfree86-type1 ?= "1.0.1"
# lib
PREFERRED_VERSION_diet-x11 ?= "1.1.3"
PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libfs ?= "1.0.1"
PREFERRED_VERSION_libfontenc ?= "1.0.4"
PREFERRED_VERSION_libice ?= "1.0.4"
PREFERRED_VERSION_liblbxutil ?= "1.0.1"
PREFERRED_VERSION_libsm ?= "1.0.3"
-PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11 ?= "1.1.4"
PREFERRED_VERSION_libx11-native ?= "1.1.1"
PREFERRED_VERSION_libxau ?= "1.0.3"
PREFERRED_VERSION_libxaw ?= "1.0.4"
@@ -239,46 +245,49 @@ PREFERRED_VERSION_libxdmcp ?= "1.0.2"
PREFERRED_VERSION_libxevie ?= "1.0.2"
PREFERRED_VERSION_libxext ?= "1.0.4"
PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfont ?= "1.3.2"
PREFERRED_VERSION_libxfontcache ?= "1.0.4"
PREFERRED_VERSION_libxi ?= "1.1.3"
-PREFERRED_VERSION_libxinerama ?= "1.0.2"
-PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxinerama ?= "1.0.3"
+PREFERRED_VERSION_libxkbfile ?= "1.0.5"
PREFERRED_VERSION_libxkbui ?= "1.0.2"
PREFERRED_VERSION_libxmu ?= "1.0.4"
PREFERRED_VERSION_libxpm ?= "3.5.7"
PREFERRED_VERSION_libxrandr ?= "1.2.2"
PREFERRED_VERSION_libxrender ?= "0.9.4"
PREFERRED_VERSION_libxres ?= "1.0.3"
-PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
PREFERRED_VERSION_libxt ?= "1.0.5"
PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxv ?= "1.0.4"
PREFERRED_VERSION_libxvmc ?= "1.0.4"
PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
-PREFERRED_VERSION_xtrans ?= "1.0.4"
+PREFERRED_VERSION_pixman ?= "0.10.0"
+PREFERRED_VERSION_xtrans ?= "1.2"
# proto
PREFERRED_VERSION_compositeproto ?= "0.4"
PREFERRED_VERSION_damageproto ?= "1.1.0"
PREFERRED_VERSION_fixesproto ?= "4.0"
PREFERRED_VERSION_glproto ?= "1.4.9"
-PREFERRED_VERSION_inputproto ?= "1.4.2.1"
+PREFERRED_VERSION_inputproto ?= "1.4.3"
PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_printproto ?= "1.0.4"
PREFERRED_VERSION_randrproto ?= "1.2.1"
PREFERRED_VERSION_renderproto ?= "0.9.3"
PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
-PREFERRED_VERSION_xproto-native ?= "7.0.11"
-PREFERRED_VERSION_xproto ?= "7.0.11"
+PREFERRED_VERSION_xproto-native ?= "7.0.12"
+PREFERRED_VERSION_xproto ?= "7.0.12"
# util
PREFERRED_VERSION_gccmakedep ?= "1.0.2"
PREFERRED_VERSION_imake ?= "1.0.2"
PREFERRED_VERSION_makedepend ?= "1.0.1"
-PREFERRED_VERSION_util-macros-native ?= "1.1.5"
-PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_util-macros-native ?= "1.1.6"
+PREFERRED_VERSION_util-macros ?= "1.1.6"
PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
# xserver
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 835bfadabe..10a0330f17 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE ?= "20080518"
+EFL_SRCDATE ?= "20080610"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
@@ -139,7 +139,7 @@ SRCDATE_mpd ?= "20070210"
SRCDATE_mystun-server ?= "20060814"
SRCDATE_olsrd ?= "20060814"
SRCDATE_opencvs ?= "20060814"
-SRCDATE_oprofile ?= "20061011"
+SRCDATE_oprofile ?= "20080210"
SRCDATE_portaudio ?= "20060814"
SRCDATE_putty ?= "20060814"
SRCDATE_python-cairo ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2e6a2bbc5f..f60c218772 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -12,6 +12,7 @@
# you know what that means? like... a, b, c, d, e, f, g...
SRCREV_pn-aircrack-ng ?= "802"
+SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
SRCREV_pn-assassin ?= "93"
SRCREV_pn-bfin-uclibc ?= "1857"
SRCREV_pn-uclibc ?= "21996"
@@ -31,16 +32,19 @@ SRCREV_pn-enlazar ?= "37"
SRCREV_pn-exalt ?= "79"
SRCREV_pn-exalt-daemon ?= "78"
SRCREV_pn-exalt-module ?= "78"
+SRCREV_pn-ezx-boot-usb-native = "2186"
SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffmpeg ?= "12186"
+SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "134"
SRCREV_pn-hildon-1 ?= "14429"
@@ -76,12 +80,13 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeyterm ?= "7b91951addfd51850a23c23ad8ba7f853c4d3416;hb=7b91951addfd51850a23c23ad8ba7f853c4d3416"
+SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "26455"
+SRCREV_pn-mplayer ?= "27047"
SRCREV_pn-mplayer-maemo ?= "342"
SRCREV_pn-multitap-pad ?= "373"
+SRCREV_pn-navit ?= "1096"
SRCREV_pn-neod ?= "4336"
SRCREV_pn-netsurf ?= "3859"
SRCREV_pn-networkmanager ?= "3202"
@@ -139,7 +144,7 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324"
SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
SRCREV_pn-openmoko-taskmanager ?= "1663"
SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "398"
+SRCREV_pn-openmoko-tasks2 ?= "399"
SRCREV_pn-openmoko-terminal2 ?= "4039"
SRCREV_pn-openmoko-theme-standard ?= "4167"
SRCREV_pn-openmoko-theme-standard-qvga ?= "4167"
@@ -152,16 +157,18 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4247"
-SRCREV_pn-opkg-native ?= "4247"
-SRCREV_pn-opkg-sdk ?= "4247"
-SRCREV_pn-oprofileui ?= "160"
-SRCREV_pn-packagekit ?= "74a3b7e3f3bc8627c23349e0b0d8429fd5f53fc6"
+SRCREV_pn-opkg ?= "4488"
+SRCREV_pn-opkg-native ?= "4452"
+SRCREV_pn-opkg-sdk ?= "4488"
+SRCREV_pn-oprofileui ?= "173"
+SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
-SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
-SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6"
-SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e"
+SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
+SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
+SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
+SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
+SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
@@ -169,7 +176,7 @@ SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
+SRCREV_pn-python-pyrtc = "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
@@ -183,6 +190,8 @@ SRCREV_pn-webkit-gtk ?= "32839"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
SRCREV_pn-wesnoth ?= "22021"
+SRCREV_pn-wlan-ng-modules ?= "1859"
+SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"
+SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 3acc8b2bc2..8661e5b065 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -166,5 +166,8 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
+PREFERRED_PROVIDER_avahi ?= "avahi"
+PREFERRED_PROVIDER_gconf ?= "gconf"
+
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 1f2356e734..d76a9c444f 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Generic uClibC
-#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration
+#@NAME: Minimal uClibC
+#@DESCRIPTION: uClibC Embedded Linux Distribution Configuration (minimal)
#
#@COMMENT: This distribution configuration serves as a starting point for
#@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -13,7 +13,7 @@ require conf/distro/generic.conf
#
# Header
#
-DISTRO_NAME = "generic-uClibC"
+DISTRO_NAME = "minimal-uclibc"
#
# Target OS & FPU system
diff --git a/conf/distro/generic.conf b/conf/distro/minimal.conf
index d67be1d738..b54b0c8c8b 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/minimal.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Generic
-#@DESCRIPTION: Generic Embedded Linux Distribution Configuration
+#@NAME: Minimal
+#@DESCRIPTION: Embedded Linux Distribution Configuration (minimal)
#
#@COMMENT: This distribution configuration serves as a starting point for
#@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -11,7 +11,7 @@
#
# Header
#
-DISTRO_NAME = "generic-glibc"
+DISTRO_NAME = "minimal-glibc"
DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
@@ -80,3 +80,4 @@ require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index d7a3b98f6e..75d9a9756a 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -62,6 +62,7 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
PREFERRED_PROVIDER_classpath = "classpath"
PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+PREFERRED_PROVIDER_midpath = "midpath-openmoko"
# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index 824ab2b7b3..d1e19aa3e4 100644
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -13,12 +13,13 @@ GUI_MACHINE_CLASS = "bigscreen"
#Ship all kernel modules till the board support has matured enough
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
-include conf/machine/include/tune-arm1136jf-s.inc
+#include conf/machine/include/tune-arm1136jf-s.inc
# requires gcc 4.3.0:
-#include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/tune-cortexa8.inc
-IMAGE_FSTYPES ?= "tar.bz2"
+IMAGE_FSTYPES += "tar.bz2 jffs2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
# Guesswork
SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf
index e2ed11f79c..ba7a099825 100644
--- a/conf/machine/davinci-dvevm.conf
+++ b/conf/machine/davinci-dvevm.conf
@@ -22,5 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa"
+MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
+
require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf
index e732957d5d..1977da8104 100644
--- a/conf/machine/davinci-sffsdr.conf
+++ b/conf/machine/davinci-sffsdr.conf
@@ -25,5 +25,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
MACHINE_FEATURES = "kernel26 serial"
+MACHINE_EXTRA_RRECOMMENDS = "dsplink-module"
+
require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf
index 19c74fb301..5bf42da797 100644
--- a/conf/machine/efika.conf
+++ b/conf/machine/efika.conf
@@ -5,7 +5,7 @@
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc603e"
-PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-rt"
MACHINE_FEATURES = "kernel26 usbhost ext2 alsa"
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 0d3a9bbcf0..785214409f 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -8,6 +8,8 @@
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt "
+IMAGE_FSTYPES += "jffs2"
+
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.inc
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index a9945acd34..52c2b04690 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -2,7 +2,7 @@ TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
#cat /proc/mtd
#dev: size erasesize name
@@ -14,12 +14,13 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone"
MACHINE_FEATURES += " iwmmxt"
-
MACHINE_DISPLAY_WIDTH_PIXELS = "240"
MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
MACHINE_DISPLAY_ORIENTATION = "0"
MACHINE_DISPLAY_PPI = "180"
+XSERVER = "xserver-kdrive-fbdev"
+
ROOT_FLASH_SIZE = "24"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/include/tune-cortexa8.inc b/conf/machine/include/tune-cortexa8.inc
index f886366f10..51f6f3d72b 100644
--- a/conf/machine/include/tune-cortexa8.inc
+++ b/conf/machine/include/tune-cortexa8.inc
@@ -3,6 +3,6 @@
# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
-TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
+TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
FEED_ARCH = "armv7a"
PACKAGE_ARCH = "armv7a"
diff --git a/conf/machine/include/tune-pentium.inc b/conf/machine/include/tune-pentium.inc
index fbefe5bd89..008d63daa8 100644
--- a/conf/machine/include/tune-pentium.inc
+++ b/conf/machine/include/tune-pentium.inc
@@ -1,4 +1,4 @@
-TARGET_CC_ARCH = "-mcpu=pentium"
+TARGET_CC_ARCH = "-march=pentium"
PACKAGE_ARCH = "i586"
FEED_ARCH = "i586"
diff --git a/conf/machine/include/tune-pentiumpro.inc b/conf/machine/include/tune-pentiumpro.inc
index 6b110cc0b6..3406bb0c71 100644
--- a/conf/machine/include/tune-pentiumpro.inc
+++ b/conf/machine/include/tune-pentiumpro.inc
@@ -1,4 +1,4 @@
-TARGET_CC_ARCH = "-mcpu=pentiumpro"
+TARGET_CC_ARCH = "-march=pentiumpro"
PACKAGE_ARCH = "i686"
FEED_ARCH = "i686"
diff --git a/conf/machine/neuros-osd.conf b/conf/machine/neuros-osd.conf
index f88379aa2a..09a71535c6 100644
--- a/conf/machine/neuros-osd.conf
+++ b/conf/machine/neuros-osd.conf
@@ -9,6 +9,11 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
PREFERRED_VERSION_u-boot = "git"
#UBOOT_MACHINE = "davinci_dvevm_config"
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
new file mode 100644
index 0000000000..4a540270f4
--- /dev/null
+++ b/conf/machine/neuros-osd2.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: neuros OSD2
+#@DESCRIPTION: neuros OSD2
+
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-neuros"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+
+PREFERRED_VERSION_u-boot = "git"
+#UBOOT_MACHINE = "davinci_dvevm_config"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+ROOT_FLASH_SIZE = "29"
+
+MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 09c382f376..190d1d1049 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
MACHINE_CLASS = "neo1973"
PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
UBOOT_ENTRYPOINT = "30008000"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 3b9ed1b468..45dc0518a4 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -8,7 +8,7 @@ TARGET_ARCH = "arm"
MACHINE_CLASS = "neo1973"
PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
UBOOT_ENTRYPOINT = "30008000"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
new file mode 100644
index 0000000000..416db2c937
--- /dev/null
+++ b/conf/machine/omap3evm.conf
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: omap3 EVM
+#@DESCRIPTION: Machine configuration for the TI omap3 EVM
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6 armv7 armv7a"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+
+#include conf/machine/include/tune-arm1136jf-s.inc
+# requires gcc 4.3.0:
+include conf/machine/include/tune-cortexa8.inc
+
+# Ship all kernel modules
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
+IMAGE_FSTYPES ?= "jffs2 tar.bz2"
+EXTRA_IMAGECMD_jffs2 = "-lnp "
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_ARCH = "arm"
+
+MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"
+
diff --git a/conf/machine/xilinx-ml403.conf b/conf/machine/xilinx-ml403.conf
index 9b51b87a7f..219d1f301e 100644
--- a/conf/machine/xilinx-ml403.conf
+++ b/conf/machine/xilinx-ml403.conf
@@ -7,7 +7,7 @@
TARGET_ARCH = "powerpc"
PACKAGE_EXTRA_ARCHS = "ppc405"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ml403-slab-2.6.x"
+PREFERRED_PROVIDER_virtual/kernel = "linux-xilinx-slab"
MACHINE_FEATURES = "kernel26 ext2"