diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /conf | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'conf')
42 files changed, 408 insertions, 201 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b69b6757db..48e098db44 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -688,6 +688,7 @@ include conf/documentation.conf require conf/sanity.conf require conf/abi_version.conf require conf/enterprise.conf +require conf/compatibility-providers.conf ################################################################## # Weak variables (usually to retain backwards compatibility) diff --git a/conf/checksums.ini b/conf/checksums.ini index e77f316c9d..1f76481579 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,7 +1,3 @@ -[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.bz2] -md5=0461c2085ac1ad7e648aa84c4ba51dd1 -sha256=b84617a2fd219153a6df95dc7f4aa1ba9c07af5859a3d00fc23f9aaed2a1e3d5 - [http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz] md5=c6a2705f6210d8ede50a947b375f1c0b sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88 @@ -62,6 +58,14 @@ sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47 md5=779472ae02c2a99937879a8d1d4b9b25 sha256=cfb98e7635c985733dba0fb9c3cadee22ab70fb3b0db7eac8eacaebc65c92a59 +[http://maxim.org.za/AT91RM9200/2.6/2.6.22-rc1-at91.patch.gz] +md5=2453815aba40e9487d24822d769fbab1 +sha256=95cec79fb6db261760421c1bb9df8a0f4955e0ee90e08cb9930a4c7a2482c1a6 + +[http://maxim.org.za/AT91RM9200/2.6/2.6.23-rc3-at91.patch.gz] +md5=822f2f85b658fb1f39b8a20fab781cfc +sha256=e8ead43fa562cc76ac34d0d4841fd1e4f4964a830403801433e34961d1ce0e84 + [http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz] md5=4469d6336f9659f1725fedd4a52261ad sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d @@ -1546,9 +1550,9 @@ 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 [http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz] md5=61156ef32015c56dc0f2e3317f4ae09e @@ -2082,6 +2086,10 @@ sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e md5=3e6bcedc549cb4c014227f882969db5c sha256=f6277da4651bceaeab442f864b735a5d7b0998d55f9209e37cf18f7464320e3e +[http://downloads.sourceforge.net/asio/asio-1.4.1.tar.bz2] +md5=1879b246f9217d64bd3126aa16488bc2 +sha256=aeb5c997940e6afd399c62316f03f480557f2b721354adff065d230183ff2782 + [http://802.11ninja.net/~jwright/code/asleap-2.1.tgz] md5=eb74eca847fa71ba89a965548526f7ac sha256=ba77747cfb107d31cf4ae2eb27839cfa196c0fca08c98465256a4820b9d85d29 @@ -5782,6 +5790,10 @@ sha256=6d851f4117002d3523354b70c3f9be4abe5325b084ff54d01ac6daa5ce9a5944 md5=cc101da3b436607ee2265b5af5001484 sha256=ab7c305be32708c4ede670e13783b718e6a28e35b5495e6c42c31c35a8b512a6 +[http://www.hugovil.com/repository/dvnixload-0.2.6.tar.gz] +md5=33308f47405c0e96a8248c7b1229dee5 +sha256=5b76e9cb0ee843208c17053315926e0e168db8a89fe960655a0d0f4871e2b9da + [http://www.threekong.com/download/dweba/dweba-1.0.0-pre14.tar.gz] md5=6f0bd0bcda35c6a96cc3853f16ba82d4 sha256=ea32ca58b6500d9061177da23ef03f918ef0c5bbbdd082a843f4834cef9c4957 @@ -6530,6 +6542,10 @@ sha256=14fbf10de1fc3b58cfeb00bcfebf54e0182cc7cc346c4bbc90248cfc61add462 md5=987956757c3707ba0e62ce2cd133011b sha256=7754930742d3c3cc2a05af38263ba58ba416b7359f8a0c598ae0f7377277d3b3 +[http://downloads.sourceforge.net/eyeos/eyeOS_1.8.7.1.zip] +md5=020b1ffd9edc3fe7af25b0d6cca430ae +sha256=660cd2de4fbd511b767839cb5caa734ebfa9cc5935aa58604f764d7e295768d4 + [http://www.ez-ipupdate.com/dist/ez-ipupdate-3.0.10.tar.gz] md5=6505c9d18ef6b5ce13fe2a668eb5724b sha256=f7ff9bf972139b303616018a6937aa4c6df4e93c935ffd004b30845e2ad41ea6 @@ -6726,6 +6742,10 @@ sha256=e4db7a6305ffe2333fae08c940ded8f7e5b02999e0917b0ea4ef3764c80f58c8 md5=145f4d2ba24c54288bad2d66ddd2baf2 sha256=d7bcc7cafb1c78f00b380dc2facdb82c5a2fb1475e1ddfc8e5d44a2b855cec1a +[http://www.fbreader.org/fbreader-sources-0.12.1.tgz] +md5=7236d094a91f26d19a3cfd3db8fcf946 +sha256=02a6a143abf3b5ab875392acef8d67f5cc991ea364e3bd250628e6a31b1f9923 + [http://only.mawhrin.net/fbreader/obsolete/fbreader-sources-0.7.3d.tgz] md5=705a89bb03860fb312a7afa25db0310e sha256=ec9f93968147526a9b2dd17e31a6d2795356b2eeed309f796f655b37b98abd83 @@ -7682,6 +7702,10 @@ sha256=44b7e18ba9ae5667dd64c89f7b04627bda5807a3a90255a125702d63c0c4ee17 md5=d5e8be59e307cef76bc479e1684df705 sha256=9f3b3ed7c9fffccefefa9af432eee7244a65592118851f75b5897814cb79b86f +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/2_25_00_04/exports/framework_components_2_25_00_04.tar.gz] +md5=11410b5cf4142ae415b683af0e9929b5 +sha256=161432f5cf184f96de290f807a4a6fddf11f2612d5b2efd91f8187c0ac612a40 + [http://downloads.sourceforge.net/free42/free42.tgz] md5=1fc21e04b3b77150846027dc7cb5210d sha256=9d348a9d2d5bf8eabc7e7bb6f0907e611403e4abe6dc1e11b1b2ad1118b3088a @@ -7886,6 +7910,10 @@ sha256=fa1b97a6d9d2f7d7699f6b0ccd433ab132c7d10835b449ed14b12b48e7749aad md5=d133e77f625c496ae9d58629d7443596 sha256=b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f +[http://rtp-net.org/ipaq/patches/2.6.14-3/full.patch] +md5=d7ec27a9b44eed194426038640af5460 +sha256=70e8e8230390fb355d62270764f18f6b553bcb9383ddabfbed4a1238b0e79b80 + [http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/full.patch] md5=230b98276779339a4102abdb1c36197a sha256=866d1e45a575f448148c227f60cde4c8b607c51f179da3a7ec1acb5036b8e3ec @@ -10946,6 +10974,10 @@ sha256=01ba0c34c3bf3bc4ea7728550e3bcfca779a48907ea4d6d9e5a83e8678df5096 md5=dbb085088337e2dd8c0216c36523ea06 sha256=68a114ece326b258b26259d31b9bb59c10049ff0162bcaa0f4f7a7dea9d244dc +[http://gupnp.org/sources/gssdp/gssdp-0.7.1.tar.gz] +md5=725c32e8f92a072cc34f0e091937df2a +sha256=8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7 + [http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.1.tar.bz2] md5=e21aef9a84d67dea9a68c1379781f763 sha256=a2c877c38d057875c7dfbf1803030c5cc9707020b77f91673500d6ea8d858607 @@ -11562,6 +11594,10 @@ sha256=f78e4b0a361b67805892c1a0e72f3cef92fbc96112157895660a478979ddeef4 md5=bfb12195c76bb6632bd917f2c2bc12d6 sha256=241e416cbe2c02f413fde82a8587bfe2fe9915fbed3a6fb20c86520b8d7543ef +[http://gupnp.org/sources/gupnp/gupnp-0.13.1.tar.gz] +md5=9b5fcf8146ba9a2bd84382f61717aa0e +sha256=e97faaebf0da42617a43de4c7c1148a51148f2a2cdaa2a10855e377b968a07fd + [http://gupnp.org/sources/gupnp-av/gupnp-av-0.2.tar.gz] md5=ab485bf263d0a3d2f771817241c970b9 sha256=782e4e45abcba1b3fe34276580653f4dbfbe8a26eee69a290675dfa7faa309f8 @@ -11570,6 +11606,10 @@ sha256=782e4e45abcba1b3fe34276580653f4dbfbe8a26eee69a290675dfa7faa309f8 md5=f6e813591ff89e8e61a46f416046450f sha256=34b6e104b480e501e430daa68fca63906a939a6cb02bc43814ed06d2856a72ac +[http://gupnp.org/sources/gupnp-av/gupnp-av-0.5.2.tar.gz] +md5=15ccfbb17553bf1cb00bf8e1d801005e +sha256=dfd438f40e31047d6f06db30db05d5f876c6294a8509f170482d712f552e9892 + [http://gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.1.tar.gz] md5=27d3a55eae2243661f49a7cf40e1e195 sha256=c4004de997674bb54d5844391dd824c6aee78184b075e7ea5d8f816e0d031e25 @@ -12410,6 +12450,10 @@ sha256=76167e10c30d60534dc2b04fa4e202e16531df8170fc23cc4414d9afff09c32a md5=828a84c64ef933bfcc805b838576a774 sha256=8ba0eda3157193643eb3c5ccd46c0ca8060d702f260df60f89656cb891cbeeb8 +[ftp://ftp.cac.washington.edu/imap/imap-2007b.tar.Z] +md5=4d59ce6303cf8ef93ff51341b1ce2df7 +sha256=b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0 + [http://downloads.sourceforge.net/imdbpy/imdbpy-2.5.tar.gz] md5=dbbb53f835fd3f7aebcf7601dd902920 sha256=edaad2859a4f0785a34c3c0bb5a1e09d8f16efa3c0e4616f6a5a6cf18c282aa6 @@ -14474,6 +14518,10 @@ sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef md5=866fd13611a8de946428db1df9be8468 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7 +[http://libcli.googlecode.com/files/libcli-1.9.4.tar.gz] +md5=b917617d21b90db214971efe64a33416 +sha256=c1e56ff2e55a879b7c89b5808aea76063512d9a24cffd601aa3d9a84cd6a7928 + [http://repository.maemo.org/pool/maemo5.0alpha/free/libc/libconbtui/libconbtui_1.4.1.tar.gz] md5=68ac3177685c577aadf8d2e9f47b1878 sha256=c3540df46bd9716c6a6f521806c70ae548822a5e62d245900cc28b5fa9fc3eb3 @@ -14586,6 +14634,10 @@ sha256=9422e73c55aa921fbbce06e5e01bba0b98bb7a0f1640c27cfd307c290dba792c md5=6c5b6fff276c3a1171ceb41c6d4b6e34 sha256=76866075a54aa04f4f18f2cf09cf19c84dee4ed22c45b741dc4067f5e224430d +[http://www.des-testbed.net/sites/default/files/libdessert0.86.14.tar.gz] +md5=7c9f9ecfcc36217ac2af3dba7828e284 +sha256=4cea899ab0fc3d96a6ba1e5e7e28253636f4ceb3ed3cba88da4cbaa328e42285 + [http://handhelds.org/~paxanima/files/libdictionary.tar.gz] md5=10ee733c70e96e8e9f01d3de2cc0c78c sha256=46f0a85f340e099e9010c8eb9a28d727830aedb32be48fe0a2f0cd081e0623fd @@ -15514,6 +15566,10 @@ sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25 md5=b73cbd5bc3cd268722a624a5f1318fde sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258 +[http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.1.0.tar.bz2] +md5=273329a78c2e9ea189ac416c7fde94a1 +sha256=c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/liblbxutil-X11R7.0-1.0.0.tar.bz2] md5=1bcffde85723f78243d1ba60e1ebaef6 sha256=e485f36d74f477f3d235a05bb67b502dc744092569842d9ab45e2f785f74f556 @@ -15878,6 +15934,10 @@ sha256=07128710a699b453dcd7b92e33f2aa8dcbbfe0a657d33040803cdaf0997e442c md5=757371e21e4f3653ce4d12d3ba0be1e0 sha256=9a0864cd442c43e5b69072dc0617b56252bc933fce26f6bfd6d47909287a353a +[http://downloads.sourceforge.net/omxil/libomxil-bellagio-0.9.2.tar.gz] +md5=42ab7383c4ca4093000ec7062289112b +sha256=dc5d3cf256390d5419ea7dc3fc35761999a1da99fa4b645ac3e92a6a279c38fc + [http://ftp.gnome.org/pub/GNOME/sources/liboobs/2.22/liboobs-2.22.0.tar.bz2] md5=1b090ecd6c0df58b131795ff9a5c9057 sha256=b35760855d7d1def532e9e808cecde29b75cec455b238590072abf4a8206536e @@ -16066,6 +16126,10 @@ sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce md5=685cb20e7a6165bc010972f1183addbd sha256=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead +[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.11.0.tar.bz2] +md5=686320dcec98daad0bdfb8894d4f2a2b +sha256=6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab + [http://www.xmailserver.org/libpcl-1.4.tar.gz] md5=6d63c462911349de80109c0161ed6d37 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686 @@ -17086,6 +17150,10 @@ sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b md5=ed40cf4088c306400b005bbd63ac36be sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b +[http://mirror.lihnidos.org/GNU/savannah/linphone/3.1.x/sources/linphone-3.1.0.tar.gz] +md5=ed40cf4088c306400b005bbd63ac36be +sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b + [http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2] md5=d74fc9ea01384bead3925434b932d6b7 sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69 @@ -17342,6 +17410,10 @@ sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f md5=84c077a37684e4cbfa67b18154390d8a sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512 +[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.tar.bz2] +md5=260551284ac224c3a43c4adac7df4879 +sha256=5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e + [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] md5=e921200f074ca97184e150ef5a4af825 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 @@ -17406,6 +17478,10 @@ sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade md5=de958cdb8d00e74792dd69f3c945b037 sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/linuxutils/2_25_01_06/exports/linuxutils_2_25_01_06.tar.gz] +md5=15486b27c9960f06b53f8a60e90f941d +sha256=61b86cdb5c1b2f9eb766fece6ea5ae89f29cf84d0c3eecbcc9b5d0ffd42d2bcb + [http://gpephone.linuxtogo.org/download/gpephone/liblipsevent-0.1/lips_event-0.1.tar.gz] md5=1fd0f41f9676ef0c882921bc37628d07 sha256=7182cf3f63e11e7ea6c6a994f9e70ef3bf6e430a5db643f5b29a0fd0996ddfd5 @@ -17450,6 +17526,10 @@ sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db md5=827a1ac5adf9aadd0c13b54a897e297b sha256=7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3 +[http://xorg.freedesktop.org/releases/individual/app/listres-1.0.2.tar.bz2] +md5=3c0d5d8d6abaf411cd0647bc7073ac38 +sha256=4d9e24b95619bc961936d241106ffcc483995de55629567113ad78ba0b37ffb7 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/listres-X11R7.0-1.0.1.tar.bz2] md5=2eeb802272a7910bb8a52b308bf0d5f6 sha256=41711ff3c94144b8a561146948b9b5fd49a55756532fa4d254d9a959e6622d87 @@ -19090,6 +19170,10 @@ sha256=76e151048a736cf490630ace4909f2d4b65f1afe2447c7fd794d270eb956e045 md5=48897aeb3a7ee5c64f30e56789f105a8 sha256=7b549ca4af77fc5b0472df1ecd9e76d2f8415258ddcfb63dfa64a55a04e1e590 +[http://www.multiprecision.org/mpc/download/mpc-0.8.1.tar.gz] +md5=5b34aa804d514cc295414a963aedb6bf +sha256=e664603757251fd8a352848276497a4c79b7f8b21fd8aedd5cc0598a38fee3e4 + [http://downloads.sourceforge.net/musicpd/mpd-0.11.2.tar.gz] md5=b6e913dc4b63b161bb1b96030763c3a7 sha256=e784f78b3cce93367c105619c690465b78a88d3e4c616cc829f4cb5e66f2bbe0 @@ -20986,6 +21070,10 @@ sha256=34beecc0dd156267e8004fb79efea9bf97e1157ed597bdde1841c16def2e9195 md5=955088e5139ef5914d44fe15b4a50b90 sha256=924c27b95f0c3792bf3d48ff854ef145e8916452b917067d653f59102f03c0d4 +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.18.8.bz2] +md5=090f582d2a0e1951d500b2e55f7df7b4 +sha256=cde777361d2a4818ea9c215e195a87da4847dafa94a10ac8c9f4bd8dc49fde3f + [http://www.muru.com/linux/omap/patches/patch-2.6.19-omap1.bz2] md5=3590e42e1a6ea4676df5b187b830b402 sha256=b7cba2e38e81abb4d1d33c3f7f7c028310b392d5ee1ed5e3b2137e024598d903 @@ -21014,6 +21102,10 @@ sha256=808ca62a66d7cfe40123301c2f51fc0dcd817ee3bb0df96d1e9e97cc3bad6a9c md5=b9c8734471a454806c77f040fcf9869b sha256=5ee24e1c5636bcffed155b1c01d7d09fedb135fa2458c190a0da03a82c8c2f60 +[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.22/patch-2.6.22-rc1.bz2] +md5=9bc06492dce31c87f1cdfa2ce5b0cf4c +sha256=dd33f3e9059bed043194ee5200239f26d3ad607ab5c872e7ce92595c1eb5d0e4 + [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.22.19.bz2] md5=066cc3bdd2783dcd01f6ff466e449ec0 sha256=829c48b49c71d89468f2a5a05587714811197545eeba31e9643cabacf344d33a @@ -21042,6 +21134,10 @@ sha256=c2085fc8fc6df586ef8c19a4562b84162f0b77956d691aa4fbee5e90c9800cb7 md5=736ea68a03158c24e55aa95e0ab15ceb sha256=4d2c13dee5ea7bd8b5cdbf63afa9383b45f6bad1f75b163c49e086a5030a04de +[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.23/patch-2.6.23-rc5.bz2] +md5=8253467313749aee6065093cd3c5fd9c +sha256=c8c2068183aca79c46182f3d3fe6d7579cd60809681d42c52d71cf1873cd1a0e + [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.1.bz2] md5=896c5d4e7fd68d37b8c16e5d2842563b sha256=55e811b4d4b0cbfde500bdd5455b7180d3def3dbdc52314520b7327d32b23f42 @@ -21138,6 +21234,10 @@ sha256=7fc735b85225850dae3c3acfe4bf0fe59f4c884d7c37f89395867dc73bf8f8af md5=e75d87c11065955871b2e005d0242c99 sha256=0e5e633e81f1dcc0dcd2372494fbd2d6a72b28bb177a3285c4766a9659b454bd +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.41.bz2] +md5=a431f1f68badcfa5a6cecc6b4d52d319 +sha256=ed3ec802ccb3585bf0a57724471fa24b98cce5caef8f35d6c26fed7c9213168d + [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.8.bz2] md5=ec23e3dce22b23ca681199fe515f10fb sha256=31c35db09289c6e0436a258745d7180e0cd8f567949f27b3dab5a57a3664ed2f @@ -21182,6 +21282,10 @@ sha256=25a9aff47cc568e4bcaa4377cacbcae11ea454aeeea9519aa3a1b6dbffea713c md5=2f399a5e286a9fe7cb40bfd3d42a7a3d sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4 +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.10.bz2] +md5=6485fe0cf0f0220493647505bfd2f7b0 +sha256=a1ffb806d7d0083aa8d0525cbccede4172f4a44c8df1ddfeece629b6d8304201 + [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.30.4.bz2] md5=d0fc44b54ba5953140b3f2aa9a1f2580 sha256=b7716971e73c8fa96ecd9cdb598c8bd3a2a946e289cfef5dcfaa11a0022737ce @@ -21210,6 +21314,18 @@ sha256=bc670682ed9b81d5d3859130c600601bd72053fd738b51b2daf8ddf3f4614a66 md5=6cac5e59d5562b591cdda485941204d5 sha256=41e7d98a205d58a62901daf4e46ecf5fb0b177e5a233a3c0ad3250a3a0abe8aa +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.7.bz2] +md5=801b9c379a12339c0210dc5d1a8e9537 +sha256=f9edbb3c15c4094d840d5954131bb91c4513d333b30bced7b5c906d36c843d5e + +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.8.bz2] +md5=0fda994c76a981a67464f43c766f2180 +sha256=c120bf7018749fca765773975b3d4444fa244781ceb844e4b9bab9b478cad213 + +[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.1.bz2] +md5=abc24a9beb8431a75301dd3884b37a3c +sha256=26f6fad3259ad6d2356cfa04462ace5fd3b5cecec410bbcefe7d5f6dbeb00baa + [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2] md5=d6249654087f0bcafaa860ac573316a4 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac @@ -21462,6 +21578,10 @@ sha256=3e9510ce715f28b7e6b803fcdadb73b37c83792c0b5e1e9bcb066ab972649996 md5=e6029fafcee029edcfa2ceed7a005333 sha256=e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1 +[http://us2.php.net/distributions/php-5.2.11.tar.bz2] +md5=286bf34630f5643c25ebcedfec5e0a09 +sha256=9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23 + [http://us2.php.net/distributions/php-5.2.5.tar.bz2] md5=1fe14ca892460b09f06729941a1bb605 sha256=5cac1e70df5019ebdfdab2e0b8b216f7fdf56b9895c9f68c993313918249bba3 @@ -21998,6 +22118,10 @@ sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4 md5=6617a6681f4e5e3d8ddc48955d73d7ab sha256=a1c6170e508a3516d0a23963d7fa5cf0a457be431c210096f6b1cecd0731a9f4 +[ftp://ftp.debian.org/debian/pool/main/p/prelink/prelink_0.0.20090925.orig.tar.gz] +md5=ed90412ad4ee7f5b5e8fff3d6649e49b +sha256=2110261aedd8423fa3f1dba5ecb08bd61beb708883f82753b09835076cba2e36 + [http://www.red-bean.com/~proski/firmware/primary.tar.bz2] md5=0c7c82264602ee2b7ad832d5cd1e1940 sha256=3b5bd68653ff5054586f9fad7ad729bd2d551e76949aec2d14b8a89308393a36 @@ -23814,6 +23938,10 @@ sha256=04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c md5=7a0c73ccf0e31808ad37b61e730cd10e sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba +[http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-0.4.6.tar.bz2] +md5=f28c48e2caf79b8e9056636259056de7 +sha256=67c58590430d04799644d164e4a5977356d95528864ea787356e35dd314e660f + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-dma.patch] md5=4336cca098b577608813a7c1454f2edd sha256=c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7 @@ -26826,6 +26954,10 @@ sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401 md5=51bb54c08415ee3c3000b7df9e9b07c5 sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67 +[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.4.1.tar.gz] +md5=8ac38951e753f250aaefbd4ba0afda94 +sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986 + [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2] md5=bc6be634532d4936eb753de54e1663d3 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd @@ -26850,6 +26982,10 @@ sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c md5=64c54d43787339a7cced48390eb3e1d0 sha256=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c +[http://rtp-net.org/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch] +md5=e0b42e51630e9cd7e3b0adf1be42f4a1 +sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571 + [http://rtpnet.nerim.net/ipaq/patches/2.6.14-3/v2.6.14-gitcurrent.patch] md5=e0b42e51630e9cd7e3b0adf1be42f4a1 sha256=0c625e90d13f91269d3a02ebdfba97226651a849ad8d69a0734bb5df7964c571 @@ -27598,6 +27734,10 @@ sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43 md5=43cbe5c7508f7dc3e141c346a897fbe7 sha256=b31c3bc4e85e7f972db1dfb7b447d213694569e2a5794a84116295c334a11f43 +[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.bz2] +md5=0461c2085ac1ad7e648aa84c4ba51dd1 +sha256=b84617a2fd219153a6df95dc7f4aa1ba9c07af5859a3d00fc23f9aaed2a1e3d5 + [http://downloads.sourceforge.net/wxwindows/wxWidgets-2.8.10.tar.gz] md5=05b32ca051651f4b1885a90f62969faf sha256=4a65573bc12e15b21a4acdce89e7e6b71edbe214817457f90fcf855220bafe66 @@ -27934,6 +28074,10 @@ sha256=8290616302932e72d4224cbe27d872efa5f44b0b8553ded0bbfb3537abe76907 md5=59d8d79fb950a55722c0089496fd18b1 sha256=ae38043c9dbf99a516f4edc58ef6235ceba975d8b5f374244a2b3e96793d7d5a +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/6_23/exports/xdais_6_23.tar.gz] +md5=09b0a14b9f8fb98686a98857eedd10a1 +sha256=12e60870930d9392c37dabdd25988e6dd5fb66ce0fe1e3b0d72250c90c8c26b7 + [http://xorg.freedesktop.org/releases/individual/app/xdbedizzy-1.0.2.tar.bz2] md5=ecef9cfd197d00980e0d69ee4126d890 sha256=74e882e9fee7ebeb274caf43071afff92531b8a41f34650376146a131166012d @@ -27954,6 +28098,10 @@ sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb md5=c7cd094cdc49459018b6f0e1eb95af30 sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15/exports/xdctools_setuplinux_3_15_01_59.bin] +md5=c7cd094cdc49459018b6f0e1eb95af30 +sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23 + [http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2] md5=b3884eaec59a63691f66bc29ce57a56d sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22 @@ -28342,6 +28490,10 @@ sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8 md5=e56ce4424b89b2409c6e73e007a85da7 sha256=462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.2.tar.bz2] +md5=b2bfe368022eedf2671ee28daba31efc +sha256=029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2] md5=d982c6f185f4c75a4b65703ceed7be06 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4 @@ -28658,6 +28810,10 @@ sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b md5=2cf0a2b0b3006bcfcd85bb77d966244a sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.1.tar.bz2] +md5=29a6f9da5123149e4abc8ff83880ed5c +sha256=a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2] md5=be8a4bd474ad6c85b93f66dd6fcfa6ee sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727 @@ -29162,6 +29318,10 @@ sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e md5=1b22188bd9012a148206940708b52ea6 sha256=c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.16.tar.bz2] +md5=fb02d5506e35054348d1c2b2c924530d +sha256=4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2] md5=f9b38e24157c3aac6014119ac18d76da sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952 @@ -30414,6 +30574,10 @@ sha256=400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 md5=4c5482552f38a7d42398a694cc9b2ee6 sha256=de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2 +[http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.2.tar.bz2] +md5=7365c0852750134119734bc1879f60ca +sha256=47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlogo-X11R7.0-1.0.1.tar.bz2] md5=0314b2f5173da64957031400638fa5f8 sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131 @@ -31462,6 +31626,10 @@ sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36 md5=6660ce6dac0a6ca495a0e954cb6b40a2 sha256=fc619215ca90cab48efae7bdf524d1de690b75832f07f3cbcb6d5c3910d402a1 +[http://ftp.gnome.org/pub/GNOME/sources/zenity/2.28/zenity-2.28.0.tar.bz2] +md5=262c476aebbf67a7043cd80c6a03add3 +sha256=3747a23ce46b0ee68e6261d669ae461f0f460d9c6ad19e04acbd518ddfcc8c63 + [http://www.progsoc.org/~wildfire/zeroconf/download/zeroconf-0.6.1.tar.gz] md5=31ac40fdaf24b3e666ed83c1320dd7a5 sha256=3e93416ad44202c2952a1342dad12f2ad0e61dd3f1c59110d9ad8cb1d4c639e5 diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf new file mode 100644 index 0000000000..10a81f2943 --- /dev/null +++ b/conf/compatibility-providers.conf @@ -0,0 +1,72 @@ +############################################################################# +# DEFAULT PREFERRED PROVIDERS +# Every distribution should include this file. +# It will make adding new providers easier. +#PREFERRED_PROVIDER_atd ?= "atd-over-fso" +PREFERRED_PROVIDER_atd ?= "atd" +PREFERRED_PROVIDER_avahi ?= "avahi" +PREFERRED_PROVIDER_bluez-libs ?= "bluez4" +PREFERRED_PROVIDER_bluez-utils ?= "bluez4" +PREFERRED_PROVIDER_bluez-utils-dbus ?= "bluez-utils" +PREFERRED_PROVIDER_classpath ?= "classpath" +PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" +PREFERRED_PROVIDER_esound ?= "pulseaudio" +#PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr" +PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu" +#PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config-shr" +PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config" +PREFERRED_PROVIDER_gconf ?= "gconf" +#PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +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+" +PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" +#PREFERRED_PROVIDER_gpsd ?= "fso-gpsd" +PREFERRED_PROVIDER_gpsd ?= "gpsd" +PREFERRED_PROVIDER_gtk+ ?= "gtk+" +PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf" +PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" +PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules" +PREFERRED_PROVIDER_hotplug ?= "udev" +PREFERRED_PROVIDER_libfribidi ?= "fribidi" +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_libxss ?= "libxss" +PREFERRED_PROVIDER_ntp ?= "ntp" +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_task-bootstrap ?= "task-bootstrap" +PREFERRED_PROVIDER_tslib-conf ?= "tslib" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_util-linux ?= "util-linux-ng" +PREFERRED_PROVIDER_virtual/alsa-scenarios ?= "alsa-scenarii-shr" +PREFERRED_PROVIDER_virtual/db ?= "db" +#PREFERRED_PROVIDER_virtual/db ?= "db3" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +#PREFERRED_PROVIDER_virtual/db-native ?= "db3-native" +PREFERRED_PROVIDER_virtual/gail ?= "gtk+" +PREFERRED_PROVIDER_virtual/javac-native ?= "ecj-bootstrap-native" +PREFERRED_PROVIDER_virtual/java-initial ?= "jamvm-initial" +PREFERRED_PROVIDER_virtual/java-native ?= "jamvm-native" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +#PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" +PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" +PREFERRED_PROVIDER_virtual/shr-splash-theme ?= "shr-splash-theme-logo" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index abc9a936d6..26614adb72 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -87,21 +87,6 @@ PREFERRED_VERSION_glibc-initial ?= "2.9" PREFERRED_VERSION_uclibc ?= "0.9.30.1" PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1" -# 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-angstrom" - -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" - -PREFERRED_PROVIDER_libfribidi = "fribidi" - #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" ANGSTROM_GCC_VERSION_xilinx-ml403 ?= "4.1.1" @@ -140,33 +125,10 @@ 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" + # The default is too old for linux-libc-headers-2.6.31: PREFERRED_VERSION_mplayer = "0.0+1.0rc2+svnr29789" @@ -175,43 +137,19 @@ ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4 ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" -# 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/angstrom${ARM_ABI}.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-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" # do some task-base stuff here diff --git a/conf/distro/include/angstrom-package-deb.inc b/conf/distro/include/angstrom-package-deb.inc index 3dbb175f93..e060bb1ccf 100644 --- a/conf/distro/include/angstrom-package-deb.inc +++ b/conf/distro/include/angstrom-package-deb.inc @@ -1,4 +1,4 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index a33a4ad2b4..14206bda2d 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg} diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 6e65285e99..8647dd7ec4 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -11,8 +11,10 @@ BUILDNAME = "Angstrom ${DISTRO_VERSION}" TARGET_VENDOR = "-angstrom" -# Add FEED_ARCH to overrides -OVERRIDES .= ":${FEED_ARCH}" +SOC_FAMILY ?= "Unknown" + +# Add FEED_ARCH and SOC_FAMILY to overrides +OVERRIDES .= ":${FEED_ARCH}:${SOC_FAMILY}" # Put links to sources in deploy/sources to make it easier for people to be GPL compliant INHERIT += "src_distribute_local" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 7cc923cc60..d881202b09 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02" PREFERRED_VERSION_confuse ?= "2.5" PREFERRED_VERSION_confuse-native ?= "2.5" PREFERRED_VERSION_connect ?= "0.1" -PREFERRED_VERSION_connman ?= "0.10" +PREFERRED_VERSION_connman ?= "0.15" PREFERRED_VERSION_conserver ?= "8.1.14" PREFERRED_VERSION_console-tools ?= "0.3.2" PREFERRED_VERSION_contacts ?= "0.7" @@ -1963,7 +1963,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.6.3" +PREFERRED_VERSION_wpa-supplicant ?= "0.6.9" PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6" PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6" PREFERRED_VERSION_wrt-imagetools-native ?= "1.0" diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc index f4ddf2fa25..fd83e02afe 100644 --- a/conf/distro/include/preferred-shr-versions.inc +++ b/conf/distro/include/preferred-shr-versions.inc @@ -17,8 +17,7 @@ PREFERRED_VERSION_classpath-native = "0.98" PREFERRED_VERSION_linux-libc-headers = "2.6.31" # override EFL_SRCREV from sane-srcrevs.inc -# now is EFL_SRCREV newer in sane-srcrevs.inc -# EFL_SRCREV ?= "43898" +EFL_SRCREV ?= "44424" # specifically set an openssh version # NOTE: whenever changing the version here make sure diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 5ec80ffeb1..204047fd63 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -36,22 +36,22 @@ PREFERRED_VERSION_binutils ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" PREFERRED_VERSION_busybox ?= "1.13.2" -PREFERRED_VERSION_dbus ?= "1.2.1" +PREFERRED_VERSION_dbus ?= "1.2.3" PREFERRED_VERSION_gcc ?= "4.2.4" PREFERRED_VERSION_gcc-cross ?= "4.2.4" PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.4" PREFERRED_VERSION_gcc-cross-initial ?= "4.2.4" PREFERRED_VERSION_gcc-cross-intermediate ?= "4.2.4" -PREFERRED_VERSION_glib-2.0 ?= "2.18.3" -PREFERRED_VERSION_glib-2.0-native ?= "2.18.0" +PREFERRED_VERSION_glib-2.0 ?= "2.22.1" +PREFERRED_VERSION_glib-2.0-native ?= "2.22.1" PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_ipkg ?= "0.99.163" PREFERRED_VERSION_ipkg-native ?= "0.99.163" -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_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_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_m4 ?= "1.4.8" PREFERRED_VERSION_m4-native ?= "1.4.8" diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 3d1ae5235f..7da1c16a2a 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Fri Dec 4 07:59:36 CET 2009 +#Wed Dec 16 09:33:47 CET 2009 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -13,7 +13,7 @@ PREFERRED_VERSION_fstobdf ?= "1.0.3" PREFERRED_VERSION_iceauth ?= "1.0.3" PREFERRED_VERSION_ico ?= "1.0.2" PREFERRED_VERSION_lbxproxy ?= "1.0.2" -PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_listres ?= "1.0.2" PREFERRED_VERSION_luit ?= "1.0.4" PREFERRED_VERSION_mkcfm ?= "1.0.1" PREFERRED_VERSION_mkcomposecache ?= "1.2.1" @@ -72,7 +72,7 @@ PREFERRED_VERSION_xkbprint ?= "1.0.2" PREFERRED_VERSION_xkbutils ?= "1.0.2" PREFERRED_VERSION_xkill ?= "1.0.2" PREFERRED_VERSION_xload ?= "1.0.2" -PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlogo ?= "1.0.2" PREFERRED_VERSION_xlsatoms ?= "1.0.2" PREFERRED_VERSION_xlsclients ?= "1.0.2" PREFERRED_VERSION_xlsfonts ?= "1.0.2" @@ -120,7 +120,7 @@ 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.3" -PREFERRED_VERSION_xf86-input-evdev ?= "2.3.1" +PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2" PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0" PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0" PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" @@ -135,7 +135,7 @@ PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" -PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" @@ -162,7 +162,7 @@ PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.15" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.16" PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" @@ -286,13 +286,13 @@ PREFERRED_VERSION_libxxf86vm ?= "1.1.0" PREFERRED_VERSION_libdmx ?= "1.1.0" PREFERRED_VERSION_libfontenc ?= "1.0.5" PREFERRED_VERSION_libfontenc-native ?= "1.0.5" -PREFERRED_VERSION_liblbxutil ?= "1.0.1" +PREFERRED_VERSION_liblbxutil ?= "1.1.0" PREFERRED_VERSION_liboldx ?= "1.0.1" -PREFERRED_VERSION_libpciaccess ?= "0.10.9" +PREFERRED_VERSION_libpciaccess ?= "0.11.0" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_pixman ?= "0.17.2" +PREFERRED_VERSION_pixman ?= "0.16.2" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto @@ -346,8 +346,8 @@ PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.2" PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.3.0" -PREFERRED_VERSION_util-macros-native ?= "1.3.0" +PREFERRED_VERSION_util-macros ?= "1.4.1" +PREFERRED_VERSION_util-macros-native ?= "1.4.1" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver PREFERRED_VERSION_xserver-xorg ?= "1.7.3" diff --git a/conf/distro/include/sane-feed-deb.inc b/conf/distro/include/sane-feed-deb.inc index 4f38b8f936..d953d6ebe0 100644 --- a/conf/distro/include/sane-feed-deb.inc +++ b/conf/distro/include/sane-feed-deb.inc @@ -2,5 +2,5 @@ INHERIT += "package_deb" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "update-alternatives-cworth-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth" diff --git a/conf/distro/include/sane-feed-ipk.inc b/conf/distro/include/sane-feed-ipk.inc index a33a4ad2b4..14206bda2d 100644 --- a/conf/distro/include/sane-feed-ipk.inc +++ b/conf/distro/include/sane-feed-ipk.inc @@ -1,5 +1,4 @@ INHERIT += "package_ipk" -PREFERRED_PROVIDER_virtual/update-alternatives-native = "update-alternatives-cworth-native" -PREFERRED_PROVIDER_virtual/update-alternatives = "update-alternatives-cworth" - +PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" +PREFERRED_PROVIDER_virtual/update-alternatives ?= ${PREFERRED_PROVIDER_opkg} diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index f99b44945c..d975ec261a 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -30,7 +30,7 @@ SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e" SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979" -SRCREV_pn-libframeworkd-glib ?= "dc5409fbf9d2d22a7fa871199bb66da5ac6f5084" +SRCREV_pn-libframeworkd-glib ?= "e5cc248f241ea549810051fb95f0250bd1224cf9" SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166" SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693" SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8c9638571a..060f2277e3 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" -SRCREV_pn-e-tasks ?= "14" +SRCREV_pn-e-tasks ?= "22" SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -66,7 +66,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-elmdentica ?= "171" SRCREV_pn-enlazar ?= "37" SRCREV_pn-enotes ?= "19" -SRCREV_pn-epdfview ?= "345" +SRCREV_pn-epdfview ?= "346" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-essential-dialer ?= "194" SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -86,7 +86,7 @@ SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" SRCREV_pn-gabriel-native ?= "38" -GCCREV ?= "145550" +GCCREV ?= "155234" SRCREV_pn-gcc ?= ${GCCREV} SRCREV_pn-gcc-cross ?= ${GCCREV} SRCREV_pn-gcc-cross-initial ?= ${GCCREV} @@ -104,25 +104,15 @@ SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gridpad ?= "194" SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-gtkhtml2 ?= "1158" +SRCREV_pn-guitartune ?= "11" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" -SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" -SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323" +SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14" SRCREV_pn-illume-theme-asu ?= "4881" SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5" -SRCREV_pn-intone ?= "66" -SRCREV_pn-intone-video ?= "9" +SRCREV_pn-intone ?= "75" +SRCREV_pn-intone-video ?= "12" SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" @@ -196,7 +186,7 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-navit ?= "2809" +SRCREV_pn-navit ?= "2846" SRCREV_pn-navit-icons ?= "2618" SRCREV_pn-neod ?= "4617" SRCREV_pn-neomis ?= "6" @@ -303,10 +293,10 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde" -SRCREV_pn-shr-launcher ?= "92" +SRCREV_pn-shr-launcher ?= "99" SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7" -SRCREV_pn-shr-specs ?= "ed8452c3153b6961f2d264129edcd349296d49c3" +SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca" SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-splash-theme-dontpanic ?= "e994275bbfdca33a6776d9edbddc711c10aba40d" SRCREV_pn-shr-splash-theme-handy ?= "e994275bbfdca33a6776d9edbddc711c10aba40d" @@ -418,6 +408,9 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}" SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-waker ?= "${EFL_SRCREV}" +#illume default keyboards +SRCREV_pn-illume-keyboard-default ?= "${EFL_SRCREV}" + #exalt SRCREV_pn-exalt ?= "${EFL_SRCREV}" SRCREV_pn-exalt-client ?= "${EFL_SRCREV}" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8a331ae7f2..10a2bc4a02 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -166,6 +166,12 @@ PREFERRED_PROVIDER_avahi ?= "avahi" PREFERRED_PROVIDER_gconf ?= "gconf" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" +# we use bluez4 instead of the older bluez3 +DISTRO_BLUETOOTH_MANAGER = "bluez4" +PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" +PREFERRED_PROVIDER_bluez-libs = "bluez4" +PREFERRED_PROVIDER_bluez-utils = "bluez4" + # Include any package preferred versions and srcrevs: require conf/distro/include/preferred-slugos-versions.inc diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 25880dff9d..d9fc595303 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -72,12 +72,6 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:\ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/gail ?= "gtk+" -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 33eceab456..1e9eec20f4 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -84,20 +84,6 @@ LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc ############################################################################# -# PREFERRED PROVIDERS -############################################################################# -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gconf = "gconf-dbus" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" -PREFERRED_PROVIDER_virtual/db = "db3" -PREFERRED_PROVIDER_virtual/db-native = "db3-native" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" -PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" - -############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index a1f2089d1b..64d45e41d1 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -157,34 +157,11 @@ require conf/distro/include/sane-toolchain.inc ############################################################################# # PREFERRED PROVIDERS ############################################################################# -PREFERRED_PROVIDER_qemu-native = "qemu-native" -PREFERRED_PROVIDER_gconf = "gconf" -PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo" -PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" PREFERRED_PROVIDER_gpsd = "fso-gpsd" -PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr" -PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr" -PREFERRED_PROVIDER_libfribidi = "fribidi" -PREFERRED_PROVIDER_bluez-libs = "bluez4" -PREFERRED_PROVIDER_bluez-utils = "bluez4" -PREFERRED_PROVIDER_classpath = "classpath" -PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" -PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -PREFERRED_PROVIDER_virtual/gail = "gtk+" -PREFERRED_PROVIDER_opkg = "opkg" -PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial" PREFERRED_PROVIDER_atd = "atd-over-fso" -PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" -PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_avahi = "avahi" -PREFERRED_PROVIDER_gtk+ = "gtk+" -PREFERRED_PROVIDER_libgpewidget = "libgpewidget" -PREFERRED_PROVIDER_virtual/db = "db3" -PREFERRED_PROVIDER_virtual/db-native = "db3-native" -PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_opkg = "opkg" PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" +PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" ############################################################################# # PREFERRED VERSIONS diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index d82be5d2b5..d9b00f41a8 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -12,7 +12,8 @@ DISTRO_TYPE = "alpha" TARGET_ARCH ?= "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-gnueabi" -IPKG_VARIANT ?= "opkg-nogpg-nocurl" +IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos" +PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos" IMAGE_INITSCRIPTS ?= "initscripts-slugos" require conf/distro/include/slugos.inc diff --git a/conf/machine/cm-t35.conf b/conf/machine/cm-t35.conf new file mode 100644 index 0000000000..ccb9f95773 --- /dev/null +++ b/conf/machine/cm-t35.conf @@ -0,0 +1,46 @@ +#@TYPE: Machine +#@NAME: CM-T35 machine +#@DESCRIPTION: Machine configuration for the CompuLab CM-T35 board (http://www.compulab.co.il/t3530/html/t3530-cm-datasheet.htm) + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-evtouch \ + xf86-input-tslib \ + xf86-video-omapfb \ + xf86-input-keyboard" + +GUI_MACHINE_CLASS = "bigscreen" + +require conf/machine/include/omap3.inc + +IMAGE_FSTYPES += "tar.bz2 ubi" +EXTRA_IMAGECMD_jffs2 = "-lnp " + +# Guesswork +SERIAL_CONSOLE = "115200 ttyS2" + +UBOOT_MACHINE = "cm_t35_config" +PREFERRED_VERSION_u-boot = "git" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 126976 bytes +# from ubiattach stdout: +# UBI device number 0, total 4039 LEBs +MKUBIFS_ARGS = "-m 2048 -e 126976 -c 4039" + +# 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 = "-O 2048 -m 2048 -p 128KiB" + +MACHINE_EXTRA_RRECOMMENDS = "marvell-sdio-fw" +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa wifi ext2" + diff --git a/conf/machine/da830-omapl137-evm.conf b/conf/machine/da830-omapl137-evm.conf index 4df4d63cca..0164e1c27d 100644 --- a/conf/machine/da830-omapl137-evm.conf +++ b/conf/machine/da830-omapl137-evm.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI DA830/OMAPL137 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/omapl137.inc UBOOT_MACHINE = "da830_omapl137_evm_config" UBOOT_ENTRYPOINT = "0xc0008000" diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf index bbcb45002e..aaf7583e5d 100644 --- a/conf/machine/da850-omapl138-evm.conf +++ b/conf/machine/da850-omapl138-evm.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI DA850/OMAPL138 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/omapl138.conf UBOOT_MACHINE = "da850_omapl138_evm_config" UBOOT_ENTRYPOINT = "0xc0008000" diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index e3c0554f71..63fc2cacc4 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -28,4 +28,5 @@ MACHINE_FEATURES = "kernel26 serial" #MACHINE_EXTRA_RRECOMMENDS = "dsplink-module" require conf/machine/include/tune-arm926ejs.inc +require conf/machine/include/dm6446.inc diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf index 73c9f1e017..a352b5e926 100644 --- a/conf/machine/dm355-evm.conf +++ b/conf/machine/dm355-evm.conf @@ -5,4 +5,4 @@ require conf/machine/include/davinci.inc require conf/machine/include/dm355.inc -UBOOT_MACHINE = "davinci_dm355evm_config" +UBOOT_MACHINE = "davinci_dm355_evm_config" diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf index 7cea5dc727..1fd51234e2 100644 --- a/conf/machine/dm365-evm.conf +++ b/conf/machine/dm365-evm.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the TI Davinci DM365 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/dm365.inc UBOOT_MACHINE = "davinci_dm365evm_config" diff --git a/conf/machine/dm6446-evm.conf b/conf/machine/dm6446-evm.conf index 8b048a5474..aaa7492991 100644 --- a/conf/machine/dm6446-evm.conf +++ b/conf/machine/dm6446-evm.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the TI Davinci DM6446 EVM board require conf/machine/include/davinci.inc +require conf/machine/include/dm6446.inc UBOOT_MACHINE = "davinci_dvevm_config" diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf index 5a9df79ade..ccf571ef9f 100644 --- a/conf/machine/hawkboard.conf +++ b/conf/machine/hawkboard.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the TI Hawkboard require conf/machine/include/davinci.inc +require conf/machine/include/omapl138.conf UBOOT_MACHINE = "da850_omapl138_evm_config" UBOOT_ENTRYPOINT = "0xc0008000" diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index ceafa800b2..3f8254aff4 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 = "r12" +MACHINE_KERNEL_PR = "r28" TARGET_ARCH = "arm" diff --git a/conf/machine/include/dm355.inc b/conf/machine/include/dm355.inc index dffafe4460..d666d5e030 100644 --- a/conf/machine/include/dm355.inc +++ b/conf/machine/include/dm355.inc @@ -1,9 +1,2 @@ - -DEVICES = "DM355" -GPPOS = "LINUX_GCC" -PLATFORM = "dm355" -PROGRAMS = "APP_LOCAL" -TARGET = "dm355_al" -XDC_PLATFORM = ti.platforms.evmDM355 - +SOC_FAMILY = "dm355" diff --git a/conf/machine/include/dm365.inc b/conf/machine/include/dm365.inc new file mode 100644 index 0000000000..c53680ea63 --- /dev/null +++ b/conf/machine/include/dm365.inc @@ -0,0 +1,12 @@ +SOC_FAMILY = "dm365" + + +# DMAI +PLATFORM = "dm365" +XDC_PLATFORM = ti.platforms.evmDM365 + +# Obsoleted (CE examples rebuild) +#GPPOS = "LINUX_GCC" + +# DMAI recipe +#TARGET = "dm365_al" diff --git a/conf/machine/include/dm6446.inc b/conf/machine/include/dm6446.inc new file mode 100644 index 0000000000..c14e573c74 --- /dev/null +++ b/conf/machine/include/dm6446.inc @@ -0,0 +1,13 @@ +SOC_FAMILY = "dm6446" + +# TI DVSDK stuff: +DSPCFG ?= "DM6446GEMSHMEM" +DSPLINKDSPCFG ?= "DM6446GEMSHMEM" +DSPLINKGPPOS ?= "MVL5G" +DSPLINKPLATFORM ?= "DAVINCI" +DSPLINKSOC ?= "DM6446" +DSPPOWERSOC ?= "DM6446" +GPPOS ?= "LINUX_GCC" +PLATFORM ?= "dm6446" +XDC_PLATFORM ?= "ti.platforms.evmDM6446" + diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 2f242a4b38..9ff7b91ad9 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,3 +1,5 @@ +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 @@ -12,17 +14,10 @@ UBOOT_LOADADDRESS = "0x80008000" EXTRA_IMAGEDEPENDS += "u-boot" # TI DVSDK stuff: -CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" -CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" -DEVICES ?= "OMAP3530" -DSPCFG ?= "OMAP3530SHMEM" +# DSPLink rebuild DSPLINKDSPCFG ?= "OMAP3530SHMEM" DSPLINKGPPOS ?= "OMAPLSP" DSPLINKPLATFORM ?= "OMAP3530" DSPLINKSOC ?= "3530" -DSPPOWERSOC ?= "omap3530" -GPPOS ?= "LINUX_GCC" -LPMDSPPOWERSOC ?= "omap3530" -PLATFORM ?= "omap3530" -XDC_PLATFORM ?= "ti.platforms.evm3530" + diff --git a/conf/machine/include/omapl137.conf b/conf/machine/include/omapl137.conf new file mode 100644 index 0000000000..34d0e9a754 --- /dev/null +++ b/conf/machine/include/omapl137.conf @@ -0,0 +1,2 @@ +SOC_FAMILY = "omapl137" + diff --git a/conf/machine/include/omapl138.conf b/conf/machine/include/omapl138.conf new file mode 100644 index 0000000000..4c222753df --- /dev/null +++ b/conf/machine/include/omapl138.conf @@ -0,0 +1 @@ +SOC_FAMILY = "omapl138" diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc index a7dd04f596..44058c12be 100644 --- a/conf/machine/include/tune-atom.inc +++ b/conf/machine/include/tune-atom.inc @@ -1,8 +1,9 @@ # GCC 4.3.0- (see Poky) # TARGET_CC_ARCH = "-march=i586" -# # GCC 4.3.1+ (see Gentoo) TARGET_CC_ARCH = "-march=core2" - # GCC 4.4.2+ (see Fedora 12) #TARGET_CC_ARCH = "-march=i686 -mtune=atom" +BASE_PACKAGE_ARCH = "i686" +FEED_ARCH = "i686" +PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586"
\ No newline at end of file diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc index d9f1c1ba85..1ba4a3422d 100644 --- a/conf/machine/include/zaurus-kernel.inc +++ b/conf/machine/include/zaurus-kernel.inc @@ -3,6 +3,9 @@ MACHINE_KERNEL_VERSION = "2.6" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" + +# Starting with 2.6.32 linux-rp is deprecated +#PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/kernel_collie = "linux" PREFERRED_PROVIDER_virtual/kernel_tosa = "linux" diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf index f58219bd1a..23b3cf7c37 100644 --- a/conf/machine/ion.conf +++ b/conf/machine/ion.conf @@ -8,8 +8,6 @@ TARGET_ARCH = "i686" #MACHINE_ARCH = "core2" -PACKAGE_EXTRA_ARCHS = "x86" - include conf/machine/include/tune-atom.inc MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index b751cbcac2..9b552a462a 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -26,4 +26,5 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen" require conf/machine/include/tune-arm926ejs.inc require conf/machine/include/neuros.inc +require conf/machine/include/dm6446.inc diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 5bdeba01f3..e1c5127072 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24" PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev" -PREFERRED_PROVIDER_mesa_shr = "mesa" +PREFERRED_PROVIDER_virtual/libgl = "mesa" XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 5fc96ec4ed..8e8355ba6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -15,8 +15,8 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel" #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31" PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri" -MACHINE_DRI_MODULES_shr = "glamo" +PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" +MACHINE_DRI_MODULES = "glamo" XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse" diff --git a/conf/machine/sgh-i900.conf b/conf/machine/sgh-i900.conf index 2080bf8e1a..4d3cd5fcee 100644 --- a/conf/machine/sgh-i900.conf +++ b/conf/machine/sgh-i900.conf @@ -11,6 +11,7 @@ TARGET_ARCH = "arm" require conf/machine/include/tune-xscale.inc MACHINE_FEATURES = "alsa apm bluetooth camera gps kernel26 phone screen touchscreen vfat wifi" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" # Software/packages selection # |