diff options
Diffstat (limited to 'conf')
84 files changed, 837 insertions, 370 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 123d9ce7a7..ac2d281123 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,7 @@ HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" HOST_PREFIX = "${TARGET_PREFIX}" HOST_CC_ARCH = "${TARGET_CC_ARCH}" -TARGET_ARCH = "INVALID" +TARGET_ARCH ?= "INVALID" TARGET_OS = "INVALID" TARGET_VENDOR = "${BUILD_VENDOR}" TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" @@ -588,6 +588,7 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "bluetooth", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "vfat", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ diff --git a/conf/checksums.ini b/conf/checksums.ini index afa2a95e2b..36b7a8f4bf 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -222,6 +222,10 @@ sha256=137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f md5=61beda590bfc5b4a12e979d5f2d70d7a sha256=dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd +[http://downloads.sourceforge.net/mesa3d/MesaLib-7.0.2.tar.bz2] +md5=93e6ed7924ff069a4f883b4fce5349dc +sha256=9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e + [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz] md5=598bb59b86c2c4842eeffb03392fab5b sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5 @@ -590,6 +594,10 @@ sha256=0aa0084a74f912f4002f1c40a815ce62ac13331ec84787a954d8bea06e1c96c5 md5=9d7cde75aecf4b85478c0e47343d4293 sha256=0aa0084a74f912f4002f1c40a815ce62ac13331ec84787a954d8bea06e1c96c5 +[http://files.chumby.com/source/ironforge/build396/align.pl] +md5=d1cbac52c52b956d9cbe6277a7f9a8c5 +sha256=67695e9af2b0938b6406eeed41954bf8317693aa7ef8ad2e30fcea5bea59777f + [ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.11.tar.bz2] md5=ef7ae78a0ef08cbeacb295f2518886ab sha256=6b25f3d22cdb2476233f6dd74880fd88fb65124d4c282704bb9f0bf3fbd4c8d2 @@ -602,6 +610,10 @@ sha256=7a17403ac478cae0d837461b7efcd9075b17c6e7f3e2221fe1f2fdbd14f11dcf md5=1ef39fb723f9209109134d6f4860cb21 sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3 +[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.15.tar.bz2] +md5=94254ea0d2c966a58184b134e9da29ff +sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952 + [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2] md5=3106c2d59a329263867fa3dd44133dda sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790 @@ -622,6 +634,10 @@ sha256=d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0 md5=6d3009c157ac6fc803696d6590a48366 sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb +[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.15.tar.bz2] +md5=287f46f891581c15018de4f8c0731575 +sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac + [http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz] md5=e3619c07bd175ce5f73d67388c0c2ea5 sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13 @@ -1110,6 +1126,10 @@ sha256=fe6de9ccfab9e9fbdbe1a2cbe4a9ea771d1a2efc7f2122a2350214394587ff39 md5=9d7e02ea9a4c43d8f030500f282ee8bf sha256=cf37ac1eb3ec0c473e527f11f068fc5fcc7452d688acc89a0e52553f51fc36bb +[http://bluez.sourceforge.net/download/bluez-libs-3.23.tar.gz] +md5=8f0368c6213abef36f1e563b44b2eed4 +sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e + [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz] md5=8b73b0ccbcef6a4270468487b1309990 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8 @@ -1134,6 +1154,10 @@ sha256=f8f242c6835ae826bf1f4eaee6c50d47d6208715e45450ba42c1769094c3f296 md5=ef596746d656ed034ed64596f72ef3c2 sha256=5ed4245e31fa43789a3090d02a25ed90eaee95819cce30cda59d4d09f4fc0db0 +[http://bluez.sourceforge.net/download/bluez-utils-3.23.tar.gz] +md5=767ad814bff4e1806f873ecf2434ba89 +sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103 + [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz] md5=f63b440396baee7dee9259395a205d48 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39 @@ -1270,6 +1294,26 @@ sha256=984b7974670d4f0291094ea2a36ee21fe46591f36cb51f95292dbe143c1eeab4 md5=158ccadd830fe6cb3d21a109f398e037 sha256=08ef1e87c7198fb6d7c0a5f830fc2d99e5fd077dbb7d4ca1b66117ae924f6df3 +[http://www.busybox.net/downloads/busybox-1.7.2.tar.gz] +md5=34c76dc55004d8d5dcea884e0e99bc21 +sha256=e0eb7d59ba996a58608999998ad630c67b93c05af4eafea29770c4839c0e5461 + +[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch] +md5=4149857c0b2c7f3d52a1f2cec5d7778d +sha256=73706e7d77144a6270da02ede61cde3c2e3b0e716d879737ac9d478b29233ba9 + +[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch] +md5=6c5f498e0677fd91b5b0e85ec5ac3b23 +sha256=b80a8c173c7a7a40a504585c6af5c74396c8fdbbb1cec179de9edcc030aa6a9a + +[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-logger.patch] +md5=43c292e93bf92623aaa29dd0e243e9a9 +sha256=5117584a563c512b68cd9678d3cf54e6186f5a062836398791385f8ed73cca86 + +[http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-tail.patch] +md5=c211189556c59a2665af45bffe5a5878 +sha256=f44c3c2d7d9b3fc8a5f9fb6ac587ae4170d2515d72f9e76deb8c071ce9847abe + [http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz] md5=b9d77c57bda2e019207a1874d9bb4dea sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3 @@ -1318,6 +1362,10 @@ sha256=594e78a66044898c321e378d47faf43b665b23ba638834d2787e344ba13e5132 md5=b254633046eafe603776d0bee791b751 sha256=7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47 +[http://cairographics.org/releases/cairo-1.4.8.tar.gz] +md5=5b9db574c9fbb94ce52047600190a1ba +sha256=a3e9b0f07910ee325406118cf3e136fc78a5155c47fdb19e66e895a3c587bc51 + [http://gpephone.linuxtogo.org/download/gpephone/calendar-1.0/calendar-1.0.tar.gz] md5=eb7be3b85955a1bbe7a0154cbf2f70f9 sha256=7e6425b688a2d4bbeef0904cac52737b232d03fdc4d35866fd03359f2d5f1794 @@ -1506,6 +1554,10 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057 md5=c0b57a115e24005f9828ca7b53908779 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd +[http://www.cmake.org/files/v2.4/cmake-2.4.8.tar.gz] +md5=f5dd061c31765a49dc17ae8bdc986779 +sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1 + [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz] md5=4cd3ce38efbd27c6cf4223f0ced2a5b5 sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff @@ -1870,6 +1922,10 @@ sha256=49c8303f58abf3a0efbbd42decdc5968688df32c154cffb20a1c3c1ae8b92048 md5=074cf116cc2c7194f2d100bc5f743833 sha256=963cc8a1f7e73a0929b7b527f6b4cfc5f78c932d673b5c13c889108d3182811a +[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h] +md5=c0124afc760d4fe8c24ffcf15ba7f391 +sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962 + [http://downloads.sourceforge.net/devio/devio-1.0.tar.gz] md5=3f421c80bce00b8bfe68ef9f453932b7 sha256=25380c3722c75b993d530c09d48f5941c0a640a4382f6a0e1878c4ee8459dd16 @@ -2378,10 +2434,22 @@ sha256=4b891e1d58c8cdf397737ac81a9328d8c663743b41f835bb2267831866d75a3e md5=cf25d5d4c943ebf2293fe6f23ecba0fd sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841 +[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz] +md5=3654bbbf01deeb0d804df194e1b1a2b3 +sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce + [ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz] md5=3654bbbf01deeb0d804df194e1b1a2b3 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce +[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.8.3.tar.gz] +md5=f123ffb457eb3577fcbb5e2c2432a922 +sha256=fd2ae24fc5bc14bfe63e0be551134a0f7906659f45803a427a2377b67d193867 + +[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.1.tar.gz] +md5=163a846e51b39fd626b43548c2cdda7c +sha256=6a3a993ab90540719e47b4968f60f8023a3cbb93f2a1ce611cd7a2d52ac1c38e + [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz] md5=1c5a2ea659680bdd1e238d7828a857a7 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e @@ -3054,6 +3122,10 @@ sha256=cfc0efbcc6fcde0d416a32dfb246c9df022515a312683fac412578c4fd09a9bc md5=ac6d19831220c4aeef4475492725486f sha256=98bdb26cd2644f2290e34453d9115b88bcff940bd1feb88db5a0fc557ec0ea5e +[ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.2.2/gcc-4.2.2.tar.bz2] +md5=7ae33781417a35a2eb03ee098a9f4490 +sha256=673b85d780a082c014ded4ac11f8269a3fe893b4dbb584d65b8602d50b3872b1 + [http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.gz] md5=fc49f45251c1336fe1dad5dba1c83fcd sha256=fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92 @@ -3222,6 +3294,10 @@ sha256=142d5d4795bef093eb9cfd50e384ae87ba9b9934d22b667174535d377ad47f1b md5=b3f6a2a318610af6398b3445f1a2d6c6 sha256=10113e7b91f858557c7edb4b611cc009855c5ff8663af54977a65acb69445058 +[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.0.tar.bz2] +md5=6fabf21f68631043bc6924e01398e3af +sha256=92e0aed2b5816bfcdfcd943215a7b59e9000f89ae7824218b7959c90161560a8 + [http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.1.tar.bz2] md5=196d7944a8ddc1f7c3d1e9c7146dd560 sha256=6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d @@ -3270,10 +3346,18 @@ sha256=0ae1b1dc1ee870d307ae6ad4546778377b04055520d3771dab1290e60ab13286 md5=1fb29764a6a650a4d5b409dda227ac9f sha256=9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529 +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.6.1.tar.bz2] +md5=11cf6d3fc86dbe0890b8d00372eb6286 +sha256=3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22 + [ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.5.tar.bz2] md5=8787868ba8962d9b125997ec2f25ac01 sha256=de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.6.1.tar.bz2] +md5=503f1315afd808728ebaa75b3d87a7d9 +sha256=67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451 + [ftp://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz] md5=c766a79a51668d7fa33f175a249655b4 sha256=c027824ee6593a838e0883bdd4bf8bd455b3dcf4ff0aa77fe82452819d882f47 @@ -3290,6 +3374,10 @@ sha256=2d7af8211cda81abde3e0bb8ccedbd18924a27b244ff35d4eacafcf899038c56 md5=183f6d46e8fa5e4b2aff240ab1586c2e sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463 +[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.6.1.tar.bz2] +md5=53d88ca624642dd267752ccce77b19d0 +sha256=d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1 + [ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2] md5=952cdde2d6aef201c528d431036d71e1 sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb @@ -4382,6 +4470,10 @@ sha256=d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2 md5=20d763198efb38263b22dee347f69da6 sha256=3aab107fb97a280b77fa30d07540e325d1511907bbce1e7efa5b4db2dffa28a3 +[http://download.gnome.org/sources/gtk+/2.12/gtk+-2.12.0.tar.bz2] +md5=e9c280afec29b11772af5a7c807abf41 +sha256=faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd + [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2] md5=c6697665e06cad01e87c2cf8d0913725 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0 @@ -4550,6 +4642,10 @@ sha256=5dc5cf08502510a00cecd6e04ef006a74ba7ed4b31d25187b5efadd70a78733b md5=a6f532770cf9286e1de38d6570cbc6bc sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d +[http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz] +md5=c7005ccb1765d8359fd2348350770495 +sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0 + [http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz] md5=bd9195d086566f56634c0bcbbbcbebea sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be @@ -4930,6 +5026,10 @@ sha256=913ff534aa777e3c36f3e9fe3e8638c3ccfe398daeb7532fa917e7bcd6fed07d md5=e2c4cf4c2ad59d1e27f09381f6b4a3c3 sha256=62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6 +[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.2.1.tar.bz2] +md5=aa948a7469168ddd9c33f11c5dff55ac +sha256=9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed + [http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.4.tar.gz] md5=3faf4bc1e2bb9353590d7b1fe50ec306 sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5 @@ -5330,6 +5430,10 @@ sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1 md5=071f96648ac25c8e87a3de11a7de2d8a sha256=ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d +[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.4.tar.bz2] +md5=4ab4e67e0b8845aa201e984153087f4a +sha256=13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04 + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libICE-X11R7.0-1.0.0.tar.bz2] md5=c778084b135311726da8dc74a16b3555 sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac @@ -5382,6 +5486,10 @@ sha256=5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541 md5=710bf38a9477a5a1b235bc94f1d0593c sha256=b77e4fd2bbd4092e7e78d0964760ad8ab160caccd4bc6d7d0c87a23febaea85e +[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.1.3.tar.bz2] +md5=4d43d3e472c552d2f191ecdd4e75112c +sha256=4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2] md5=dcf59f148c978816ebbe3fbc5c9ef0e1 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248 @@ -5454,6 +5562,10 @@ sha256=142cd1c1958e2cb92ff2975a092a2c519dd5f4c433c9d1d8b6cc9ca967aad283 md5=ec2acd10a7736a85dd1e1ed9ea5bec96 sha256=8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377 +[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.9.tar.bz2] +md5=99b7554037a92b260891091e81815a0a +sha256=1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4 + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXcursor-X11R7.0-1.1.5.2.tar.bz2] md5=048e15b725d8e081ac520e021af9a62c sha256=52bbd6e05de84e94ec11f2734029183411c91e2297779098fb17e162aca5e191 @@ -5578,6 +5690,10 @@ sha256=7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f md5=9c4dd85f3e2a75bfb60bd288502bc288 sha256=4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862 +[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.1.3.tar.bz2] +md5=7c510abb0cad8dc20493fb27ff7859d8 +sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2] md5=99503799b4d52ec0cac8e203341bb7b3 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b @@ -5650,6 +5766,10 @@ sha256=ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50 md5=5860360f5b038cc728f388f875ce525d sha256=2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407 +[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.2.2.tar.bz2] +md5=1b244b5d19f0ccab01d7083436cd3558 +sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98 + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2] md5=e10aed44c2e1e5d9e6848a62ff2c90c7 sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb @@ -5662,6 +5782,10 @@ sha256=5cfaac877aca06e3be09380037a68c6d2c4a57641fa6994bc14f07c0105cca25 md5=2f1b2c6e8dcbcb6d760e59f445abd92c sha256=0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a +[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.4.tar.bz2] +md5=dc266e850c51368f964e0d67bf5fb5e6 +sha256=5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrender-X11R7.0-0.9.0.2.tar.bz2] md5=3f0fa590dd84df07568631c91fbe68ab sha256=f240490ce348cedcf09c2c5d170c7d79002790d72ea5dc3d7d702005684ff713 @@ -6518,6 +6642,10 @@ sha256=920fa2a0924d66884825d36a2e843de069cfdf1af01945d05da25999bbd6396c md5=461d7097bf47864b872085a94ff94e10 sha256=01453d561255b5fcb361997904752860e4f8c6b9742f290578a44615fcc94356 +[http://downloads.xiph.org/releases/ogg/libogg-1.1.3.tar.gz] +md5=eaf7dc6ebbff30975de7527a80831585 +sha256=bae29e79fbc50bbedf1235852094b71c8c910a1ef0cd42fe4163b7b545630b65 + [http://liboil.freedesktop.org/download/liboil-0.3.10.tar.gz] md5=770f656bca8166dab33b322d5886a4bf sha256=4587753a023550a066abe59a7e467c1af35b9f5e81bfb40a12463ad2df8f088c @@ -6702,6 +6830,10 @@ sha256=835265bb0d39689e8a8580b5ffb53222b3f5f483d58aa533a5c7ebfc3d273d50 md5=ddc52cc8196f9f0bf48a5c7569b6bb38 sha256=83e82b9afe296584a6c9f1f8b3e3a70d324209021e0049f68d28bd1de8c18136 +[http://downloads.us.xiph.org/releases/libshout/libshout-2.2.2.tar.gz] +md5=4f75fc9901c724b712c371c9a1e782d3 +sha256=912a1fdb12d31af757e7881db49321e5b5240bd8bd4199e9fb0ce16d66568160 + [http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-1.36.59.tgz] md5=37c51ba4bd57164b1b0bb7b43b9adece sha256=3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024 @@ -6790,6 +6922,10 @@ sha256=2be78a947bdbfd24aa4f35ae97d2b7bafa60162c5e824cf3dd085b40eddee8ff md5=2cbbbeaf97c154a7fb9b088b95deb70e sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35 +[http://downloads.xiph.org/releases/theora/libtheora-1.0alpha7.tar.gz] +md5=55ee3c6db3e0927e7918309891a8f52b +sha256=f5c7730ded0273a8615b12b46a32b800bbcb9e861e3a18aa92b1c062981a2fef + [http://downloads.sourceforge.net/tilp/libticables-3.9.2.tar.gz] md5=354675bfbd881082a9447efde9935226 sha256=1c091859f09d5a38c76f0d64a93db46aa2b5d637c8a7370d348f21e7be324c37 @@ -6858,6 +6994,10 @@ sha256=748a9a5a1b2e6bf1db4cc767742acf58d836e551e56a493bd34ad759d3bb4f53 md5=4d6726fd02ce02f6e24824e594b0949a sha256=20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7 +[http://downloads.xiph.org/releases/vorbis/libvorbis-1.2.0.tar.gz] +md5=478646358c49f34aedcce58948793619 +sha256=6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73 + [http://ftp.gnome.org/pub/GNOME/sources/libwnck/2.10/libwnck-2.10.2.tar.bz2] md5=d8276da50ce560c5e66ed94e4238d9ef sha256=d03295e5cb22ed7d086ce1ce754c498ed6bc2388c45e4547417d922580d3cd7c @@ -7090,6 +7230,10 @@ sha256=727b55291a2c52f9f6b9f7ef03b2cd9fc54f7d4d1b0b2baed4c3dd6d9a890c71 md5=66d02cbd723876c6d69846a067875a22 sha256=cc56285834bed461fd405c00a34d3c3095673333b94621580eeeb0c65237af15 +[http://files.chumby.com/source/ironforge/build396/linux-2.6.16-chumby-1.2.tar.gz] +md5=efb128aed7aba5d47b72bfa8d42d97c4 +sha256=69468ffe7dade5448c498230bd67fd5a9b843ef1b11ea3fe7161b2c7fc26ea77 + [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2] md5=9a91b2719949ff0856b40bc467fd47be sha256=1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 @@ -7806,6 +7950,10 @@ sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e md5=b67ef657b83ca26249d7b9e9c5e7da69 sha256=d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5 +[http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2] +md5=391f85b4f962269e044ceac2b5235310 +sha256=24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f + [http://venge.net/monotone/downloads/monotone-0.20.tar.gz] md5=3bdf4da35ff576a401483815952f4045 sha256=56a5c5afd838f90146205ee4769b83988c6bafc85826c0fbcad982f1e0333d93 @@ -7894,6 +8042,10 @@ sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8 md5=843422d90349800ee721f6710d051c87 sha256=df551fb075d5e6d0824b74d231962cf0e104c43f646e233675d952ef3c03debc +[http://www.mpfr.org/mpfr-2.3.0/mpfr-2.3.0.tar.bz2] +md5=cf7c743e4be122e63eb6f372fc58b657 +sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48 + [http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz] md5=bb403b35c2d25655d55f0f616b8f47bb sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4 @@ -8654,6 +8806,10 @@ sha256=46e20652ae4b9ceab5879ab939ec3eb2e57de742ea734272749ca53c93a20339 md5=6a33888e34c23f7fde09a6e94e4f5950 sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b +[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.31.tar.bz2] +md5=3aa902cb7a57a4aa09427de603ebf17b +sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015 + [http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.13.tar.bz2] md5=5f09df47a16e83462384b44b75310539 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36 @@ -8734,7 +8890,7 @@ sha256=6eb45f17b50d864157dac2028ee5d45f4f54548825f5a732e1a430d5aa2dd889 md5=195b684e025ff5c15617d6f757cf631f sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d -[http://de3.php.net/distributions/php-4.4.4.tar.bz2] +[http://museum.php.net/php4/php-4.4.4.tar.bz2] md5=bc6fa8908e2ac36e93bab9f7d42cda3a sha256=9f0742fce014a255f8453c1264afee5de289a9e9dcd57c448c77b46978f6a76b @@ -8774,6 +8930,10 @@ sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4 md5=f9fea77e46ec7a3a16e925e137f146e7 sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8 +[http://cairographics.org/releases/pixman-0.9.6.tar.gz] +md5=d2b1071cdbb0b8da18039111ba2dfd22 +sha256=179abc613f5100081cdef833f24a35fe7b646b8a4f0c79647d9609f6bf8222d8 + [http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz] md5=fd5c547e9d66ba49bc735ccb8c791f2a sha256=7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6 @@ -9442,13 +9602,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b md5=8012acea71b35c18247bd92c4721589d sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz] +md5=19678fe35170559cd6a6fa531c57799c +sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz] md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 -[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] -md5=70b729dd5dd8b2b432d685918e1971f1 -sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 +[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] +md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f +sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d [http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz] md5=0e2bab65b62784d8714057624373f70d @@ -9478,6 +9642,10 @@ sha256=06b32d6f8fe7065b4c2c8142a244374e1be963757125bac20ba016b92231b5bf md5=5f8dd5a041ca7c700b16620228f922aa sha256=de7290f334baf631a14d031df304ee94cfb550aa69e7512aa589d21c2381c7d8 +[http://download.savannah.gnu.org/releases/quilt/quilt-0.46.tar.gz] +md5=4508546d1ed0257ef7c128b6121b7208 +sha256=47bf030565bb462840db694acc183273455714028c74974c5b3a3bd4ad29ad89 + [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz] md5=142b10ab27e837c3c4603cf9a7e9343b sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1 @@ -9578,6 +9746,10 @@ sha256=779317ca2e99f02b394af0c6f77f16def56de3b71a5d9f9ac6e5e9cfb65192e1 md5=28fbe8a59ebd31f098b90ec64f3d133a sha256=7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726 +[http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.3.tar.bz2] +md5=598bc9a493deee2e48e4434e94467189 +sha256=c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b + [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/renderproto-X11R7.0-0.9.2.tar.bz2] md5=a7f3be0960c92ecb6a06a1022fe957df sha256=a875741d110a73952119460fac31e1bb7d0b0aff16f59c2a0a04bcd434c74f41 @@ -9682,6 +9854,10 @@ sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29 md5=f4131d670920a878b4d4a0f5d4d8b93a sha256=a677291149687339396fed06c46cc08fd76fcb62d0f4459cae02c6cf54b4eb39 +[http://files.chumby.com/source/ironforge/build396/rt73-chumby-1.2.tar.gz] +md5=0340e1ceba72330111e6fc85679c75bf +sha256=94beb93da6dabd16892c899f496eeec745fc69b856abd0d19896b2a4b0fb7c72 + [http://music.mcgill.ca/~gary/rtaudio/release/rtaudio-3.0.1.tar.gz] md5=5b60500bc9605d2409b71124e48aa929 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 6d3ad7bd6b..25b07e0038 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe" DISTRO_NAME = "AmsDelta Linux" DISTRO_VERSION = "unstable-${DATE}" -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf DISTRO_TYPE = "debug" diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2008.1-legacy.conf index 298c8589e3..358ed06cf2 100644 --- a/conf/distro/angstrom-2007.1-legacy.conf +++ b/conf/distro/angstrom-2008.1-legacy.conf @@ -4,6 +4,6 @@ # * no sysfs # * no EABI for ARM -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf # We'll have to fill this in as we go. diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 145c463751..ec8a5b9b30 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -6,11 +6,15 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> #@-------------------------------------------------------------------- -# This is a testbed for unstable and/or untested things, while angstrom-2007.1 -# is aiming for stability and a release. +# This is a aimed to be the next stable angstrom release. +# If you want something stable *right now*, use angstrom-2007.1 +# with the org.openembedded.angstrom-2007.12-stable branch +# # Use this at your own risk, we welcome bugreports filed at # http://bugs.openembedded.org -# In doubt, use DISTRO="angstrom-2007.1" +# +# Again, in doubt, use DISTRO="angstrom-2007.1" with the +# org.openembedded.angstrom-2007.12-stable branch #DISTRO_VERSION = "2008.1" DISTRO_VERSION = "2008.1-test-${DATE}" @@ -35,14 +39,6 @@ DISTRO_TYPE ?= "debug" # Also, it appears that no locales fit in 16Mb for now. "C" locale rules! IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' -FEED_URIS += " \ - no-arch##${ANGSTROM_URI}/unstable/feed/all \ - base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ - perl##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/perl \ - python##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/python \ - debug##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/debug \ - gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" # set feed path variables FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" @@ -61,7 +57,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh18" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" @@ -91,16 +87,44 @@ PREFERRED_PROVIDER_avahi = "avahi" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" +#powerpc needs additional patches to gcc +PREFERRED_VERSION_gcc_dht-walnut ?= "4.1.1" +PREFERRED_VERSION_gcc-cross_dht-walnut ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk_dht-walnut ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial_dht-walnut ?= "4.1.1" + +PREFERRED_VERSION_gcc_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk_xilinx-ml403 ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial_xilinx-ml403 ?= "4.1.1" + +PREFERRED_VERSION_gcc_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk_mpc8323e-rdb ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-initial_mpc8323e-rdb ?= "4.1.1" + PREFERRED_VERSION_gcc ?= "4.2.2" PREFERRED_VERSION_gcc-cross ?= "4.2.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.2.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2" + #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-xorg-versions-X11R7.3.inc +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE +PREFERRED_VERSION_gcc_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.1.2" +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2" +PREFERRED_VERSION_binutils_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross_avr32 = "2.17" +PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17" +#there's is no avr32 patch for 0.9.29 +PREFERRED_VERSION_uclibc_avr32 = "0.9.28" +PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28" # Virtuals: PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" @@ -182,7 +206,7 @@ DISTRO_EXTRA_RDEPENDS += "\ update-modules \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ - ipkg ipkg-collateral \ + ipkg ipkg-collateral ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ ${DEBUG_APPS} \ " @@ -195,3 +219,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ avahi-autoipd \ openssh-sftp-server \ " + +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202008.x&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" + diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf new file mode 100644 index 0000000000..f0e1ec2ad8 --- /dev/null +++ b/conf/distro/chinook-compat.conf @@ -0,0 +1,175 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Chinook-compatible +#@DESCRIPTION: Distribution which allows building packages compatible to OS 2008 +#@-------------------------------------------------------------------- + +# Note: This is not a complete distribution. Just some definitions to make +# it possible to build packages that are compatible to Nokia's OS2008. +# You should *not* replace core libraries of the operating system (glibc, +# glib, gtk+, ..) with those you build in OE. +# +# Furthermore it may be possible that OpenEmbedded lacks specific versions +# of some packages. If you encounter such a problem please provide a recipe +# or file a bug! + +DISTRO = "chinook-compat" +DISTRO_NAME = "Chinook-compat" +DISTRO_VERSION = "test-${DATE}" +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" + +require conf/distro/include/angstrom-glibc.inc +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -O1" + +INHERIT += "package_deb debian" +TARGET_OS = "linux-gnueabi" + +TARGET_FPU_nokia770 = "soft" +TARGET_FPU_nokia800 = "hard" + +DPKG_ARCH_nokia770 = "armel" +DPKG_ARCH_nokia800 = "armel" + +FEED_ARCH_nokia770 = "armv5te" + +# Actually n800 is armv6 but we are using armv5te because qemu does not emulate +# armv6 yet. +FEED_ARCH_nokia800 = "armv5te" +#FEED_ARCH_nokia800 = "armv6" + +#Make sure we use 2.6 on machines with a 2.4/2.6 selector +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +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" + +PREFERRED_PROVIDER_virtual/libc = "glibc" + +# NPTL stuff +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_VERSION_automake-native = "1.9.6" + +PREFERRED_VERSION_binutils = "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross = "2.18" + +PREFERRED_VERSION_gcc = "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3" +PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3" + +# Use recent enough version of the headers to let HAL build successfully. +PREFERRED_VERSION_linux-libc-headers = "2.6.20" + +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-intermediate = "2.5" +PREFERRED_VERSION_glibc-initial = "2.5" + +PREFERRED_VERSION_libtool = "1.5.6" + +require conf/distro/include/sane-srcrevs.inc + +PREFERRED_VERSION_fontconfig = "2.4.1" +PREFERRED_VERSION_freetype = "2.2.1" +PREFERRED_VERSION_freetype-native = "2.2.1" +PREFERRED_VERSION_cairo = "1.4.10" +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_gnome-vfs = "2.16" +# 3.9.1 would be correct +PREFERRED_VERSION_gtkhtml-3.8 = "3.8.2" +PREFERRED_VERSION_libxml2 = "2.6.27" +# 2.16 would be correct +PREFERRED_VERSION_gconf = "2.6.1" + +# gstreamer +# 0.10.13 would be correct (+ maemo patches) +PREFERRED_VERSION_gstreamer = "0.10.14" +PREFERRED_VERSION_gst-plugins-good = "0.10.6" +# 0.10.13 would be correct (+ maemo patches) +PREFERRED_VERSION_gst-plugins-base = "0.10.14" +# 0.11.3 would be correct ( + maemo patches) +PREFERRED_VERSION_gst-ffmpeg = "0.10.2" + +PREFERRED_PROVIDER_virtual/db = "db" +PREFERRED_PROVIDER_virtual/db-native = "db-native" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +# This is a hack to avoid building mesa which crashes the compiler +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-directfb" + +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" +PREFERRED_VERSION_libxrandr = "1.2.1" +PREFERRED_VERSION_xrandr = "1.2.0" +PREFERRED_VERSION_randrproto = "1.2.1" + +PREFERRED_VERSION_libgnomeui = "2.18.1" + +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+" + +PREFERRED_PROVIDER_gconf = "gconf" + +PREFERRED_VERSION_pixman = "0.9.6" + +PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt" +PREFERRED_PROVIDER_avahi = "avahi" + +# Prevent chosing jikes-native (until java bootstrap patch is merged). +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" + +PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon" + +PREFERRED_VERSION_libsoup = "2.2.7" +PREFERRED_VERSION_libglade = "2.4.2" +PREFERRED_VERSION_gnutls = "1.4.5" +PREFERRED_VERSION_libgpg-error = "1.0" +PREFERRED_VERSION_libgcrypt = "1.2.3" + +PREFERRED_VERSION_gpe-scap = "1.3" + +# Does not compile with the CodeSourcery compiler .. :( +PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120" +PREFERRED_VERSION_kaffeh-native = "1.1.8+cvs20080120" + +# WARNING: If you change these values after the respective package has +# been built the change will have no effect. Edit the package's file in +# ${STAGING}/pkgdata/runtime then. +PKG_ncurses = "libncurses5" +PKG_ncurses-tools = "ncurses-bin" +PKG_ncurses-terminfo = "ncurses-base" + +PKG_gtk+ = "libgtk2.0-0" +PKG_pango = "libpango1.0-0" +PKG_atk = "libatk1.0-0" +PKG_glib-2.0 = "libglib2.0-0" +PKG_gconf = "libgconf2-6" +DEBIANNAME_dbus_pn-dbus = "dbus" +PKG_hildon-1 = "libhildon1" + +PKG_zlib = "zlib1g" +PKG_libglade = "libglade2-0" +PKG_libsoup = "libsoup2.2-8" diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 234c92f62a..fe079db92d 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -8,7 +8,7 @@ FOONAS_MODE ?= "glibc" ANGSTROM_MODE = ${FOONAS_MODE} -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf DISTRO = "foonas" DISTRO_NAME = "foonas" diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index b77b3e9c87..26e78f89c1 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -21,5 +21,9 @@ DISTRO_NAME = "generic-uClibC" TARGET_OS = "linux-uclibc" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "uclibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/libiconv = "libiconv" PREFERRED_PROVIDER_virtual/libintl = "libintl" diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 7ab7818393..d67be1d738 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -36,30 +36,34 @@ MACHINE_KERNEL_VERSION = "2.6" # # Binutils & Compiler # -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" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" +PREFERRED_PROVIDER_virtual/arm-linux-binutils = "binutils-cross" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_VERSION_gcc ?= "4.1.1" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" # # Target OS & FPU system -# +# TARGET_OS = "linux" TARGET_FPU_arm = "soft" TARGET_FPU_armeb = "soft" +# +# C library +# PREFERRED_PROVIDER_virtual/libiconv = "glibc" PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/libc = "glibc" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/${TARGET_ARCH}-${TARGET_OS}-libc-for-gcc = "glibc-intermediate" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" @@ -67,28 +71,12 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.5" # Bootstrap & Init # PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc - -# -# Framebuffer & X -# -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -PREFERRED_PROVIDER_tslib ?= "tslib" -require conf/distro/include/preferred-xorg-versions-X11R7.2.inc # -# GPE +# Preferred versions # -require conf/distro/include/preferred-gpe-versions-2.8.inc -# -# Opie -# -QTE_VERSION = "2.3.10" -PALMTOP_USE_MULTITHREADED_QTE = "yes" -require conf/distro/include/preferred-opie-versions.inc +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc -# -# Enlightenment -# -require conf/distro/include/preferred-e-versions.inc +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/include/angstrom-2007-for-openmoko.inc index 4c9a254cd9..380c882c2c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -6,9 +6,13 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2007.9" -DISTRO_VERSION = "2007.9-test-${DATE}" -DISTRO_REVISION = "46" +# If you want to use the angstrom 2007.12 release or if +# you want to base you distro on angstrom 2007, switch to +# the org.openembedded.angstrom-2007.12-stable branch +# THIS FILE WILL GO AWAY IN JANUARY 2008!! + +DISTRO_VERSION = "2007.11RC3" +DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc @@ -60,7 +64,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" RDEPENDS_kernel-base_hx4700 = "" RDEPENDS_kernel-base_htcuniversal = "" @@ -251,3 +255,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \ avahi-autoipd \ openssh-sftp-server \ " + +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%202007.12&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" + diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 72533c65e5..02e2399e4e 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -97,14 +97,14 @@ PREFERRED_VERSION_bison-native ?= "2.0" PREFERRED_VERSION_bitbake ?= "1.8.6" PREFERRED_VERSION_bitchx ?= "1.1" PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.22" +PREFERRED_VERSION_bluez-cups-backend ?= "3.23" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.22" +PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23" PREFERRED_VERSION_bluez-hcidump ?= "1.38" -PREFERRED_VERSION_bluez-libs ?= "3.22" -PREFERRED_VERSION_bluez-utils ?= "3.22" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.22" +PREFERRED_VERSION_bluez-libs ?= "3.23" +PREFERRED_VERSION_bluez-utils ?= "3.23" +PREFERRED_VERSION_bluez-utils-alsa ?= "3.23" PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" @@ -174,7 +174,7 @@ PREFERRED_VERSION_classpath-minimal ?= "0.95" PREFERRED_VERSION_classpath-minimal-native ?= "0.95" PREFERRED_VERSION_clearsilver ?= "0.10.3" PREFERRED_VERSION_clish ?= "0.7.1" -PREFERRED_VERSION_cmake-native ?= "2.2.3" +PREFERRED_VERSION_cmake-native ?= "2.4.7" PREFERRED_VERSION_cms92init ?= "0.1" PREFERRED_VERSION_compositeproto ?= "0.4" PREFERRED_VERSION_comprec ?= "0.02" @@ -422,7 +422,7 @@ PREFERRED_VERSION_galago-daemon ?= "0.3.4" PREFERRED_VERSION_galculator ?= "1.2.3" PREFERRED_VERSION_gallery ?= "1.5.5" PREFERRED_VERSION_gamin ?= "0.1.8" -PREFERRED_VERSION_gammu ?= "1.13.0" +PREFERRED_VERSION_gammu ?= "1.17.0" PREFERRED_VERSION_gawk ?= "3.1.4" PREFERRED_VERSION_gawk-native ?= "3.1.4" PREFERRED_VERSION_gcalctool ?= "5.7.32" @@ -509,7 +509,7 @@ PREFERRED_VERSION_gnomesword ?= "2.1.2" PREFERRED_VERSION_gnuchess ?= "5.05" PREFERRED_VERSION_gnumeric ?= "1.6.3" PREFERRED_VERSION_gnupg ?= "1.4.2.2" -PREFERRED_VERSION_gnuplot ?= "4.2.0" +PREFERRED_VERSION_gnuplot ?= "4.2.2" PREFERRED_VERSION_gnuradio ?= "3.0.4" PREFERRED_VERSION_gnutls ?= "1.6.3" PREFERRED_VERSION_gob2 ?= "2.0.14" @@ -709,11 +709,6 @@ PREFERRED_VERSION_imlib ?= "1.9.15" PREFERRED_VERSION_imlib2 ?= "1.4.0.002" PREFERRED_VERSION_imposter ?= "0.3" PREFERRED_VERSION_inetutils ?= "1.4.2" -PREFERRED_VERSION_initramfs-jffs2 ?= "0.1" -PREFERRED_VERSION_initramfs-module-block ?= "0.1" -PREFERRED_VERSION_initramfs-module-loop ?= "0.1" -PREFERRED_VERSION_initramfs-module-nfs ?= "0.1" -PREFERRED_VERSION_initramfs-uniboot ?= "0.2" PREFERRED_VERSION_initscripts ?= "1.0" PREFERRED_VERSION_initscripts-openprotium ?= "1.0" PREFERRED_VERSION_initscripts-slugos ?= "1.0" @@ -838,7 +833,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42" PREFERRED_VERSION_libcontactsdb ?= "0.5" PREFERRED_VERSION_libcroco ?= "0.6.1" PREFERRED_VERSION_libcwd ?= "0.99.47" -PREFERRED_VERSION_libdaemon ?= "0.11" +PREFERRED_VERSION_libdaemon ?= "0.12" PREFERRED_VERSION_libdata-optlist-perl ?= "0.101" PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101" PREFERRED_VERSION_libdbi ?= "0.7.2" @@ -995,7 +990,7 @@ PREFERRED_VERSION_libpcl ?= "1.4" PREFERRED_VERSION_libpcre ?= "4.4" PREFERRED_VERSION_libpcre-native ?= "4.4" PREFERRED_VERSION_libperl6-junction-perl ?= "1.10" -PREFERRED_VERSION_libpixman ?= "0.1.6" +PREFERRED_VERSION_libpixman ?= "0.9.6" PREFERRED_VERSION_libpng ?= "1.2.20" PREFERRED_VERSION_libpng-native ?= "1.2.20" PREFERRED_VERSION_libpthread-stubs ?= "0.1" @@ -1074,7 +1069,7 @@ PREFERRED_VERSION_libwindowswm ?= "1.0.0" PREFERRED_VERSION_libwnck ?= "2.13.5" PREFERRED_VERSION_libwpd ?= "0.8.6" PREFERRED_VERSION_libx11 ?= "1.1.3" -PREFERRED_VERSION_libx11-native ?= "1.0.1" +PREFERRED_VERSION_libx11-native = "1.0.3" PREFERRED_VERSION_libxau ?= "1.0.3" PREFERRED_VERSION_libxau-native ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "1.0.4" @@ -1169,7 +1164,6 @@ PREFERRED_VERSION_m4-native ?= "1.4.8" PREFERRED_VERSION_macchanger ?= "1.5.0" PREFERRED_VERSION_madfu ?= "1.2" PREFERRED_VERSION_madplay ?= "0.15.2b" -PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626" PREFERRED_VERSION_mahjongg ?= "1.0.0" PREFERRED_VERSION_mailutils ?= "0.3.1" PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs" @@ -1236,7 +1230,7 @@ PREFERRED_VERSION_miau ?= "0.5.3" PREFERRED_VERSION_micro-emacs ?= "20060909" PREFERRED_VERSION_microcom ?= "1.02" PREFERRED_VERSION_microwindows ?= "0.90" -PREFERRED_VERSION_midori ?= "0.0.10" +PREFERRED_VERSION_midori ?= "0.0.13" PREFERRED_VERSION_midpath ?= "0.1" PREFERRED_VERSION_midpath-alsa ?= "0.1" PREFERRED_VERSION_midpath-cldc ?= "0.1" @@ -1274,6 +1268,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27" PREFERRED_VERSION_modutils-initscripts ?= "1.0" PREFERRED_VERSION_moin ?= "1.5.8" PREFERRED_VERSION_mono ?= "1.2.5.1" +PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1" PREFERRED_VERSION_mono-native ?= "1.2.5.1" PREFERRED_VERSION_monotone-4 ?= "0.19" PREFERRED_VERSION_monotone-5 ?= "0.25.2" @@ -1310,7 +1305,7 @@ PREFERRED_VERSION_nano ?= "2.0.6" PREFERRED_VERSION_nasm-native ?= "0.98.38" PREFERRED_VERSION_nautilus ?= "2.12.2" PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5" -PREFERRED_VERSION_navit ?= "0.0.1" +PREFERRED_VERSION_navit ?= "0.0.3" PREFERRED_VERSION_nbd ?= "2.8.7" PREFERRED_VERSION_ncftp ?= "3.2.0" PREFERRED_VERSION_ncmpc ?= "0.11.1" @@ -1352,7 +1347,7 @@ PREFERRED_VERSION_obby ?= "0.4.1" PREFERRED_VERSION_obexftp ?= "0.20" PREFERRED_VERSION_obexpush ?= "1.0.0" PREFERRED_VERSION_obexpush-native ?= "1.0.0" -PREFERRED_VERSION_octave ?= "2.9.14" +PREFERRED_VERSION_octave ?= "2.1.73" PREFERRED_VERSION_offlineimap ?= "4.0.14" PREFERRED_VERSION_olsr ?= "0.3-1" PREFERRED_VERSION_olsrd ?= "0.5.3" @@ -1438,7 +1433,7 @@ PREFERRED_VERSION_pine ?= "4.64" PREFERRED_VERSION_pipeman ?= "1.0.0" PREFERRED_VERSION_pipepanic ?= "0.1.1" PREFERRED_VERSION_pivotinit ?= "1.0.0" -PREFERRED_VERSION_pixman ?= "0.9.5" +PREFERRED_VERSION_pixman ?= "0.9.6" PREFERRED_VERSION_pixops-test ?= "1.0" PREFERRED_VERSION_pkgconfig ?= "0.22" PREFERRED_VERSION_pkgconfig-native ?= "0.22" @@ -1501,7 +1496,7 @@ PREFERRED_VERSION_python-dbus ?= "0.81.1" PREFERRED_VERSION_python-fam ?= "1.1.1" PREFERRED_VERSION_python-fnorb ?= "1.3" PREFERRED_VERSION_python-fpconst ?= "0.6.0" -PREFERRED_VERSION_python-gammu ?= "0.21" +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" @@ -1543,7 +1538,6 @@ PREFERRED_VERSION_python-pylinda ?= "0.6" PREFERRED_VERSION_python-pylint ?= "0.13.2" PREFERRED_VERSION_python-pymetar ?= "0.11" PREFERRED_VERSION_python-pymp3 ?= "0.3.4" -PREFERRED_VERSION_python-pyqt ?= "4.3" PREFERRED_VERSION_python-pyrad ?= "0.8" PREFERRED_VERSION_python-pyraf ?= "1.4" PREFERRED_VERSION_python-pyreverse ?= "0.5.2" @@ -1565,7 +1559,6 @@ PREFERRED_VERSION_python-scons-native ?= "0.97" PREFERRED_VERSION_python-setuptools ?= "0.6c6" PREFERRED_VERSION_python-sgmlop ?= "1.1" PREFERRED_VERSION_python-simplejson ?= "1.7.1" -PREFERRED_VERSION_python-sip ?= "4.7" PREFERRED_VERSION_python-snmplib ?= "0.1.1" PREFERRED_VERSION_python-soappy ?= "0.11.6" PREFERRED_VERSION_python-spydi ?= "0.9.7" @@ -1599,7 +1592,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0" PREFERRED_VERSION_qpe-libgaim ?= "1.5.0" PREFERRED_VERSION_qpealarmclock ?= "1.0.9" PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9" -PREFERRED_VERSION_qpegps ?= "0.9.3" +PREFERRED_VERSION_qpegps ?= "0.9.3.1" PREFERRED_VERSION_qpenmapfe ?= "1.0.0" PREFERRED_VERSION_qpf-arabic ?= "1.0" PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10" @@ -1621,7 +1614,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" PREFERRED_VERSION_qsvn ?= "0.3.0" PREFERRED_VERSION_qt-x11-free ?= "3.3.7" PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_qt4-x11-free ?= "4.3.2" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.3" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1659,6 +1652,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2" PREFERRED_VERSION_rglueap ?= "0.1" PREFERRED_VERSION_rhythmbox ?= "0.8.7" PREFERRED_VERSION_rlpr ?= "2.05" +PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0" PREFERRED_VERSION_rott ?= "1.0" PREFERRED_VERSION_rox-filer ?= "2.5" PREFERRED_VERSION_rp-pppoe ?= "3.8" @@ -1725,7 +1719,6 @@ PREFERRED_VERSION_sidplayer ?= "1.5.0" PREFERRED_VERSION_silo ?= "1.4.8" PREFERRED_VERSION_simh ?= "3.7-1" PREFERRED_VERSION_simpad-utilities ?= "1.0" -PREFERRED_VERSION_sip-native ?= "4.7" PREFERRED_VERSION_sip3-native ?= "4.0.1" PREFERRED_VERSION_sipsak ?= "0.9.6" PREFERRED_VERSION_skippy-xd ?= "0.5.0" @@ -1890,14 +1883,14 @@ PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4" PREFERRED_VERSION_u2nl ?= "1.3" PREFERRED_VERSION_uae4all ?= "0.7.1" PREFERRED_VERSION_ubahnnav ?= "0.4.1" -PREFERRED_VERSION_uboot-utils ?= "1.2.0" +PREFERRED_VERSION_u-boot-utils ?= "1.2.0" PREFERRED_VERSION_udev ?= "092" PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0" PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" PREFERRED_VERSION_uicmoc-native ?= "2.3.10" PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.2" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" PREFERRED_VERSION_uim ?= "1.3.1" PREFERRED_VERSION_uim-native ?= "1.3.1" PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" @@ -2126,7 +2119,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1" PREFERRED_VERSION_zope ?= "3.3.1" PREFERRED_VERSION_zrally ?= "0.90" PREFERRED_VERSION_zrev7 ?= "1.0.1" -PREFERRED_VERSION_zroadmap ?= "1.0.12" +PREFERRED_VERSION_zroadmap ?= "1.1.0" PREFERRED_VERSION_zsafe ?= "2.1.3" PREFERRED_VERSION_zsh ?= "4.1.1" PREFERRED_VERSION_zshopi ?= "0.2" diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc index 59d40957d5..7e8e60d7dd 100644 --- a/conf/distro/include/angstrom-uclibc.inc +++ b/conf/distro/include/angstrom-uclibc.inc @@ -14,5 +14,10 @@ TARGET_OS = "${@['${TARGET_OS_UC}', 'uclinux-uclibc'][bb.data.getVar('TARGET_ARC #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" BUILD_OPTIMIZATION = "-Os" + +#Gcc will die with 'internal consistency error when using the above optimizations +FULL_OPTIMIZATION_avr32 = "" +BUILD_OPTIMIZATION_avr32 = "" + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 510a752211..fe216800c3 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -50,6 +50,8 @@ TARGET_FPU_arm ?= "soft" TARGET_FPU_armeb ?= "soft" TARGET_FPU_ixp4xx ?= "soft" +TARGET_FPU_dht-walnut ?= "soft" + #Set the right arch for the feeds #Alphabetically sorted @@ -151,6 +153,7 @@ FEED_ARCH_nslu2be = "armv5teb" # armv6 FEED_ARCH_mx31ads = "armv6" +FEED_ARCH_mx31moboard = "armv6" FEED_ARCH_nokia800 = "armv6" FEED_ARCH_omap2420h4 = "armv6" FEED_ARCH_omap2430sdp = "armv6" @@ -256,7 +259,7 @@ TINDER_REPORT = "1" # seppuku bbclass SEPPUKU_LOGIN = "http://bugs.openembedded.org/query.cgi?" SEPPUKU_QUERY = "http://bugs.openembedded.org/buglist.cgi?" -SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?" SEPPUKU_AUTOBUILD = "1" @@ -269,5 +272,4 @@ SEPPUKU_COMPONENT = "build" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" -DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci" +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 316fc5a4de..c5390811c6 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -10,67 +10,46 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" -SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}" SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-calculator ?= "${AUTOREV}" SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-common ?= "${AUTOREV}" SRCREV_pn-openmoko-common2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-contacts ?= "${AUTOREV}" SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dates ?= "${AUTOREV}" SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-dialer ?= "${AUTOREV}" SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}" SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-footer ?= "${AUTOREV}" -SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}" -SRCREV_pn-openmoko-libs ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-messages ?= "${AUTOREV}" SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" -SRCREV_pn-openmoko-panel-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-panel-demo-simple ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-session ?= "${AUTOREV}" -SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}" -SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}" -SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}" -SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}" -SRCREV_pn-openmoko-tasks ?= "${AUTOREV}" SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}" SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}" -SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-today ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" +SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -SRCREV_pn-uboot-openmoko ?= "${AUTOREV}" +SRCREV_pn-python-gsmd ?= "${AUTOREV}" + +SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" +SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" SRCREV_pn-usbpath-native ?= "${AUTOREV}" - diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc new file mode 100644 index 0000000000..2c2e0acb03 --- /dev/null +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -0,0 +1 @@ +PREFERRED_VERSION_vte = "0.16.10" diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc index 324f4dd80c..0a95b1ff67 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070727" +OPIE_SRCDATE ?= "20080127" OPIE_VERSION ?= "1.2.3+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.3+cvs${OPIE_SRCDATE}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index b3b47093b7..aaf7b02a09 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -53,7 +53,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20071206" +EFL_SRCDATE = "20080129" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -88,6 +88,7 @@ SRCDATE_eflpp ?= "${EFL_SRCDATE}" SRCDATE_python-evas ?= "${EFL_SRCDATE}" SRCDATE_python-ecore ?= "${EFL_SRCDATE}" SRCDATE_python-edje ?= "${EFL_SRCDATE}" +SRCDATE_python-edbus ?= "${EFL_SRCDATE}" SRCDATE_python-emotion ?= "${EFL_SRCDATE}" SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" SRCDATE_python-ewl ?= "${EFL_SRCDATE}" @@ -108,6 +109,7 @@ SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" +SRCDATE_rage ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" @@ -148,7 +150,6 @@ SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" SRCDATE_yamonenv ?= "20060814" -SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a65f477296..50ba415363 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,7 +14,7 @@ SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" -SRCREV_pn-eds-dbus ?= "628" +SRCREV_pn-eds-dbus ?= "659" SRCREV_pn-eglibc ?= "4355" SRCREV_pn-eglibc-initial ?= "4355" SRCREV_pn-eglibc-intermediate ?= "4355" @@ -25,25 +25,27 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" +SRCREV_pn-gpe-contacts ?= "9312" +SRCREV_pn-gsm0710muxd ?= "42" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libfakekey ?= "1455" -SRCREV_pn-libgsmd ?= "3519" +SRCREV_pn-libgsmd ?= "3684" SRCREV_pn-libgsmd-devel ?= "3293" -SRCREV_pn-libjana ?= "697" -SRCREV_pn-libmokogsmd2 ?= "3378" +SRCREV_pn-libjana ?= "700" +SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" -SRCREV_pn-libmokoui2 ?= "3229" +SRCREV_pn-libmokoui2 ?= "3688" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "927" -SRCREV_pn-linux-openmoko ?= "3238" +SRCREV_pn-linux-ixp4xx ?= "1021" +SRCREV_pn-linux-openmoko ?= "3801" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -62,18 +64,18 @@ SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appearance ?= "3239" SRCREV_pn-openmoko-appmanager ?= "1851" SRCREV_pn-openmoko-appmanager2 ?= "3442" -SRCREV_pn-openmoko-browser2 ?= "3249" +SRCREV_pn-openmoko-browser2 ?= "3646" SRCREV_pn-openmoko-calculator ?= "2404" -SRCREV_pn-openmoko-calculator2 ?= "3235" +SRCREV_pn-openmoko-calculator2 ?= "3655" SRCREV_pn-openmoko-common ?= "397" SRCREV_pn-openmoko-common2 ?= "3259" SRCREV_pn-openmoko-contacts ?= "2298" -SRCREV_pn-openmoko-contacts2 ?= "374" +SRCREV_pn-openmoko-contacts2 ?= "387" SRCREV_pn-openmoko-dates ?= "467" -SRCREV_pn-openmoko-dates2 ?= "661" +SRCREV_pn-openmoko-dates2 ?= "673" SRCREV_pn-openmoko-dialer ?= "2811" -SRCREV_pn-openmoko-dialer2 ?= "3522" -SRCREV_pn-openmoko-feedreader2 ?= "3080" +SRCREV_pn-openmoko-dialer2 ?= "3689" +SRCREV_pn-openmoko-feedreader2 ?= "3645" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" @@ -82,18 +84,19 @@ SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" -SRCREV_pn-openmoko-mediaplayer2 ?= "3345" +SRCREV_pn-openmoko-mediaplayer2 ?= "3583" SRCREV_pn-openmoko-messages ?= "2276" -SRCREV_pn-openmoko-messages2 ?= "3477" +SRCREV_pn-openmoko-messages2 ?= "3712" SRCREV_pn-openmoko-panel-battery ?= "3360" SRCREV_pn-openmoko-panel-bt ?= "3149" SRCREV_pn-openmoko-panel-clock ?= "2567" SRCREV_pn-openmoko-panel-demo ?= "1622" SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" -SRCREV_pn-openmoko-panel-gsm ?= "3256" +SRCREV_pn-openmoko-panel-gsm ?= "3664" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" SRCREV_pn-openmoko-panel-usb ?= "3360" +SRCREV_pn-openmoko-sample2 ?= "3528" SRCREV_pn-openmoko-session ?= "152" SRCREV_pn-openmoko-sample2 ?= "3537" SRCREV_pn-openmoko-simplemediaplayer ?= "1688" @@ -102,28 +105,31 @@ 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 ?= "348" -SRCREV_pn-openmoko-terminal2 ?= "3435" +SRCREV_pn-openmoko-tasks2 ?= "361" +SRCREV_pn-openmoko-terminal2 ?= "3764" SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" SRCREV_pn-openmoko-theme-standard2 ?= "3425" SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" -SRCREV_pn-openmoko-today2 ?= "3478" +SRCREV_pn-openmoko-today2 ?= "3609" SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-python-formencode = "3148" +SRCREV_pn-python-fso-pyproto = "49" +SRCREV_pn-python-gsmd = "127" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-webkit-gtk ?= "27222" -SRCREV_pn-webkit-qt ?= "27222" -SRCREV_pn-webkit-qtopia ?= "27222" +SRCREV_pn-webkit-gtk ?= "28656" +SRCREV_pn-webkit-qt ?= "28656" +SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ab80719646..c13c9b6c75 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.7" +SLUGOS_VERSION = "4.9" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -119,11 +119,6 @@ PREFERRED_VERSION_glibc ?= "2.5" PREFERRED_VERSION_glibc-intermediate ?= "2.5" PREFERRED_VERSION_glibc-initial ?= "2.5" -# Select the correct versions of the kernel and modules (these are the -# defaults, override in the conf/distro top-level distro file). -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.6" - # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" SRCDATE_diet-x11 ?= "20060106" diff --git a/conf/distro/maemo-1.0.conf b/conf/distro/maemo-1.0.conf deleted file mode 100644 index b8592fdf68..0000000000 --- a/conf/distro/maemo-1.0.conf +++ /dev/null @@ -1,38 +0,0 @@ -require conf/distro/include/familiar.inc - -DISTRO = "maemo" -DISTRO_NAME = "Maemo Linux" -DISTRO_VERSION = "v1.0b-${DATE}" - -DISTRO_TYPE = "debug" -#DISTRO_TYPE = "release" - -FEED_URIS += " \ - " -#SRCDATE = 20050331 - -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" - -#PREFERRED_VERSION_binutils-cross = "2.15.91.0.2" -#PREFERRED_VERSION_gcc-cross = "3.4.4" -#PREFERRED_VERSION_gcc-cross-initial = "3.4.4 -#PREFERRED_VERSION_libtool-native = "1.5.6" -#PREFERRED_VERSION_libtool-cross= "1.5.6" - -# -# GPE -# - -PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" -PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" -PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" - -require conf/distro/include/preferred-gpe-versions.inc - -# -# Maemo -# - -require conf/distro/include/maemo-preferred.inc diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index 2c039dbcce..d68a03fa2b 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -6,7 +6,7 @@ #@-------------------------------------------------------------------- # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... -require conf/distro/angstrom-2007.1.conf +require conf/distro/angstrom-2008.1.conf DISTRO = "mokoslug" DISTRO_NAME = "MokoSlug" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index f2007c231f..dd6c2e0b7e 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -4,7 +4,8 @@ #@DESCRIPTION: Linux Distribution Configuration for the OpenMoko Platform #----------------------------------------------------------------------------- -require conf/distro/angstrom-2007.1.conf +require conf/distro/include/preferred-om-2008-versions.inc +require conf/distro/include/angstrom-2007-for-openmoko.inc # # Header @@ -47,11 +48,8 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd" # Same kernel runs on both these machines PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" -# Same touchscreen on both these machines -PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}" -SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0" -SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0" +PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}" # Same kernel so same usb PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}" diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf index 928817d815..533b41526b 100644 --- a/conf/distro/openprotium.conf +++ b/conf/distro/openprotium.conf @@ -1,69 +1,84 @@ # -# Open Iomega distribution - based on openslug and generic confs +# OpenProtium distribution - based upon openslug and generic confs # DISTRO_NAME = "openprotium" -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -DISTRO_TYPE = "alpha" +DISTRO_VERSION = "1.3" +DISTRO_TYPE ?= "alpha" +TARGET_OS = "linux" +# +# Basic configuration +# +DISTRO_DEV_MANAGER = "udev" +DISTRO_SSH_DAEMON = "dropbear" +DISTRO_INIT_MANAGER = "sysvinit" +DISTRO_LOGIN_MANAGER = "tinylogin" +MACHINE_TASK_PROVIDER = "task-openprotium" # # Naming schemes # -INHERIT += "debian" +INHERIT += "debian multimachine" # # Packaging and output format # INHERIT += "package_ipk" -IMAGE_BASENAME = "openprotium" -IMAGE_FSTYPES = "jffs2" -FEED_URIS = "openprotium##http://www.openprotium.org/ipkg.ppc.v1.0" +IMAGE_FSTYPES = "jffs2 tar.gz" +OPENPROTIUM_URI = "http://www.openprotium.org" +FEED_ARCH_storcenter = ppc603e +FEED_ARCH_turbostation = ppc603e +FEED_URIS = "\ + no-arch##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/all \ + base##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${FEED_ARCH} \ + ${MACHINE}##${OPENPROTIUM_URI}/releases/${DISTRO_VERSION}/${MACHINE} \ + " # For protium on the turbostation +IMAGE_BASENAME = "openprotium" IMAGE_BASENAME_turbostation = "openprotium-ts" -# -# binutils and compilers -# -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" -#conflict between this and the last below. -#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -# Select 2.6 versions of the depmod support -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" +# versions +PREFERRED_VERSION_binutils ?= "2.18" +PREFERRED_VERSION_binutils-cross ?= "2.18" -PREFERRED_VERSION_binutils = "2.16" -PREFERRED_VERSION_binutils-cross = "2.16" +PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" +PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2" -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" +PREFERRED_VERSION_glibc = "2.6.1" +PREFERRED_VERSION_glibc-intermediate = "2.6.1" +PREFERRED_VERSION_glibc-initial = "2.6.1" -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-intermediate = "2.5" -PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_linux-libc-headers = "2.6.11.1" -# -# Target OS & FPU system # -USE_NLS ?= "no" -TARGET_OS = "linux" -HOTPLUG = "udev" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" - +# Providers... # -# Bootstrap & Init +# binutils and compilers # -#PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -require conf/distro/include/sane-srcdates.inc +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-linux-libc-initial = "glibc-initial" + +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/libiconv = "glibc" +PREFERRED_PROVIDER_virtual/libintl = "glibc" + +#silence a warning message... +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + # +# Misc items. # -# Ensure consistency across all SlugOS builds for the provider of a -# relational database - use the latest version of the SleepyCat -# Berkeley database -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" +PREFERRED_PROVIDER_virtual/db ?= "db" +PREFERRED_PROVIDER_virtual/db-native ?= "db-native" +PREFERRED_PROVIDER_gconf ?= "gconf" -CMDLINE_DEBUG = "noirqdebug" +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf new file mode 100644 index 0000000000..92e5ac5b39 --- /dev/null +++ b/conf/distro/openwrt-sdk.conf @@ -0,0 +1,29 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OpenWRT-SDK +#@DESCRIPTION: Building packages for OpenWRT using its official SDK. +# +#@COMMENT: This allows to build packages only, not the whole images. +#@COMMENT: You should install and have in path an SDK from the www.openwrt.org. +#@COMMENT: SDK installers are both host and target specific (so look in download +#@COMMENT: dir for your target). If there is no SDK for your host arch, +#@COMMENT: you can also look at downloads of x-wrt.org, a sister project. +#@COMMENT: To build a package, use command like: +#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package> +#----------------------------------------------------------------------------- + +require conf/distro/generic-uclibc.conf + +# +# Header +# +DISTRO_NAME = "OpenWRT" +DISTRO_REVISION = "2" + +IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" + +# This is what lives in SDK +ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Make sure that we have correct package dependencies for SDK-provided libs. +ASSUME_SHLIBS += "libc.so.0:uclibc libm.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 29c96ce384..012081f143 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -8,7 +8,7 @@ DISTRO_NAME = "SlugOS" # DISTRO_VERSION = "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED = "unstable" -DISTRO_TYPE = "beta" +DISTRO_TYPE = "alpha" TARGET_ARCH ?= "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index ad75fffe11..5246df3990 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.9-alpha" +DISTRO_VERSION = "6.11-beta" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" @@ -45,7 +45,9 @@ 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" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}binutils:binutils-cross" PREFERRED_PROVIDERS += " virtual/libc:glibc" +PREFERRED_PROVIDERS += " linux-libc-headers:linux-libc-headers" PREFERRED_PROVIDER_libc6-unslung = "glibc" diff --git a/conf/documentation.conf b/conf/documentation.conf index 44a174a01b..6c71bc00c7 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -34,6 +34,11 @@ TARGET_CC_ARCH[doc] = "FIXME" TARGET_FPU[doc] = "Floating point option (mostly for FPU-less systems), can be 'soft' or empty \ for hardware floating point instructions." +ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\ + These packages won't be built by bitbake." +ASSUME_SHLIBS[doc] = "List of shlib:package[_version] mappings. Useful for lib packages in ASSUME_PROVIDED,\ + for which automatic shlib dependency tracking doesn't work." + PACKAGE_ARCH[doc] = 'The architecture needed for using a resulting package. If you have \ machine dependant configuration options in your bitbake file add a \ PACKAGE_ARCH = "${MACHINE_ARCH}" to the file.' @@ -98,6 +103,9 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" +FEED_URIS[doc] = "List of ipkg feed records to put into generated image." +FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image." + # insane bbclass QA_LOG[doc] = "Enable logging of QA errors to log.qa_package. Default is not to log." diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 0fa2b7d122..4d60fa729b 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -33,12 +33,19 @@ BBMASK = "" # Uncomment this if you want to use a prebuilt toolchain. You will need to # provide packages for toolchain and additional libraries yourself. You also # have to set PATH in your environment to make sure BitBake finds additional binaries. -# Note: You will definitely need to say: -# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" -# to build any of two Linux 2.4 Embedix kernels, +# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Uncomment this if you're building for an arch that uses emulated locale +# generation under qemu (mainly arm glibc) and have an external gcc 3.x compiler +# that OE recognises. This will mean the gcc-native build is skipped, speeding +# builds up. +# ASSUME_PROVIDED += "gcc-native3" + +# Uncomment this if you are building Linux 2.4 Embedix kernels. # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget # to rename the binaries as instructed in the Wiki. -# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" +# Most users do not need this anymore thankfully! +# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" # Select between multiple alternative providers, if more than one is eligible. PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 2231f80ed2..4c3112df78 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" +MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200" @@ -21,3 +21,6 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" +PREFERRED_VERSION_u-boot = "1.1.4" + + diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 4df1030570..21e256b04a 100644 --- a/conf/machine/atngw100.conf +++ b/conf/machine/atngw100.conf @@ -9,7 +9,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget" +MACHINE_FEATURES = "kernel26 ext2 usbgadget" +PREFERRED_PROVIDER_virtual/kernel = "linux" # used by sysvinit_2 SERIAL_CONSOLE = "115200" @@ -18,4 +19,6 @@ SERIAL_CONSOLE = "115200" ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" +PREFERRED_VERSION_u-boot = "1.1.4" KERNEL_IMAGETYPE = "uImage" + diff --git a/conf/machine/chumby.conf b/conf/machine/chumby.conf new file mode 100644 index 0000000000..a1d6d43600 --- /dev/null +++ b/conf/machine/chumby.conf @@ -0,0 +1,30 @@ +#@TYPE: Machine +#@Name: Chumby +#@DESCRIPTION: Machine configuration for the Chumby + +TARGET_ARCH = "arm" + +MACHINE_FEATURES = "kernel26 apm alsa bluetooth ext2 vfat touchscreen usbhost usbgadget wifi" + +GUI_MACHINE_CLASS = "smallscreen" +PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" + +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-modules \ + rt73-k2wrlz \ +" + +require conf/machine/include/tune-arm926ejs.inc + +# used by sysvinit_2 +SERIAL_CONSOLE = "38400 ttyS0" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "22" + +# extra jffs2 tweaks +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" + +IMAGE_FSTYPES += "cramfs" diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 2522897042..1b6188753e 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux = "2.6.23" +PREFERRED_VERSION_linux ?= "2.6.23" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index c91bdcfc92..5170f8993e 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,22 +5,14 @@ TARGET_ARCH = "arm" MACHINE_KERNEL_VERSION ?= "2.6" -require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc +require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc +require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" -# This is needed for the ramdisk script to work -MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" - EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" - IMAGE_LINGUAS = "" - IMAGE_FSTYPES ?= "jffs2 tar.gz" -require conf/machine/include/tune-strongarm.inc - ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above - -GUI_MACHINE_CLASS_poodle = "smallscreen" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index a8a2d60c17..6eeb08825b 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -20,6 +20,7 @@ USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_VERSION_u-boot = "1.1.4" +KERNEL_IMAGETYPE = "uImage" #tune for the 405 cpu require conf/machine/include/tune-ppc405.inc diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 09517fd11d..ad0c64bef2 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-gsm \ kernel-module-gta01kbd \ kernel-module-s3cmci \ - kernel-module-ext2 \ - kernel-module-vfat \ kernel-module-snd-soc-neo1973-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab @@ -47,3 +43,4 @@ EXTRA_IMAGEDEPENDS += "dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc + diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 4cad7924f1..bd9621413a 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-gsm \ kernel-module-gta01kbd \ kernel-module-s3cmci \ - kernel-module-ext2 \ - kernel-module-vfat \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " SERIAL_CONSOLE = "115200 ttySAC2" @@ -39,7 +35,11 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ + --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ + --littleendian --pad \ + -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" @@ -49,3 +49,4 @@ include conf/machine/include/tune-arm920t.inc # build YAFFS2 IMAGE_FSTYPES ?= "jffs2 yaffs2" + diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf new file mode 100644 index 0000000000..ce45606dbd --- /dev/null +++ b/conf/machine/gesbc-9302.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@Name: Glomation GESBC-9302 single board computer +#@DESCRIPTION: Low cost SBC based on Cirrus Logic EP9302 CPU + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost screen" + +# used by sysvinit_2 +SERIAL_CONSOLE = "57600 ttyAM0" + +# used by some images +ROOT_FLASH_SIZE = "8" +#extra jffs2 tweaks +EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " + +#tune for ep93xx cpus +#can be used for crunch support later on +#require conf/machine/include/tune-ep9312.inc + +require conf/machine/include/tune-arm920t.inc + diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 15390d2d56..439c484970 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -15,7 +15,7 @@ ROOT_FLASH_SIZE = "16" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 409eacaed5..99e82d28f4 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -13,7 +13,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen vfat" # Some extra configuration diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index c149da18fa..cad7d0393c 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -17,7 +17,7 @@ ROOT_FLASH_SIZE = "32" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat" # # Software/packages selection @@ -26,7 +26,8 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -MACHINE_EXTRA_RDEPENDS = "h2200-bootloader udev-hostap-cs-vcc-workaround" +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " h2200-bootloader " +MACHINE_EXTRA_RDEPENDS = " udev-hostap-cs-vcc-workaround " MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-h2200-audio \ kernel-module-i2c-pxa \ @@ -39,7 +40,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-h2000-audio = "snd-h2000-audio" +module_autoload_snd-h2200-audio = "snd-h2200-audio" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 1fcaf664d4..c037226154 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -17,7 +17,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h3800.conf b/conf/machine/h3800.conf index 173f2a5c8f..a13ed48d4a 100644 --- a/conf/machine/h3800.conf +++ b/conf/machine/h3800.conf @@ -3,6 +3,6 @@ #@DESCRIPTION: Machine configuration for the Compaq iPAQ 38xx devices #this machine will be primarily focussed on the 2.6 port -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget screen vfat" require conf/machine/h3600.conf diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index f475e20c46..5db7abd3d4 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 0683498c5f..03dccedccc 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index 6ed836c1de..c4c1237bae 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -6,7 +6,7 @@ # Hardware-based properties # TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te h5xxx" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" require conf/machine/include/tune-xscale.inc @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat" # # Software/packages selection @@ -26,10 +26,16 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ - kernel-module-h5400-battery" + kernel-module-h5400-battery \ + kernel-module-snd-soc-h5000" # # Modules autoload and other boot properties # +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-soc-h5000 = "snd-soc-h5000" +module_autoload_g_ether = "g_ether" + SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 711ffd314c..65a82d1e0b 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -15,7 +15,7 @@ require conf/machine/include/tune-arm9tdmi.inc MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/htcalpine.conf b/conf/machine/htcalpine.conf index 63ab097a89..f7f025413d 100644 --- a/conf/machine/htcalpine.conf +++ b/conf/machine/htcalpine.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htcapache.conf b/conf/machine/htcapache.conf index 1b44742874..b3debb633c 100644 --- a/conf/machine/htcapache.conf +++ b/conf/machine/htcapache.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htcblueangel.conf b/conf/machine/htcblueangel.conf index 44454f3902..f95cb70833 100644 --- a/conf/machine/htcblueangel.conf +++ b/conf/machine/htcblueangel.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "128" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htchimalaya.conf b/conf/machine/htchimalaya.conf index 8430cb57d4..472e5d69e6 100644 --- a/conf/machine/htchimalaya.conf +++ b/conf/machine/htchimalaya.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htcsable.conf b/conf/machine/htcsable.conf index f9326475e6..2ae1419bae 100644 --- a/conf/machine/htcsable.conf +++ b/conf/machine/htcsable.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "240" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen vfat phone" # # Software/packages selection diff --git a/conf/machine/htctornado.conf b/conf/machine/htctornado.conf index af91bcbb9f..b311afe1b4 100644 --- a/conf/machine/htctornado.conf +++ b/conf/machine/htctornado.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux-tornado-omap2" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat phone" MACHINE_EXTRA_RDEPENDS = "alsa-state" diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index b7b9b5cdc0..55a6757e7c 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.inc MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone vfat" MACHINE_FEATURES += "iwmmxt" # diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 38b0c011be..34255a1536 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "32" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone vfat" # # Software/packages selection diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf index c0d9016407..84733217d1 100644 --- a/conf/machine/hx2000.conf +++ b/conf/machine/hx2000.conf @@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "jffs2 tar.bz2" MODUTILS = "26" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost screen vfat" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index daa74866b2..0d3a9bbcf0 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -1,5 +1,5 @@ #@TYPE: Machine -#@NAME: iPAQ hx47xx +#@NAME: HP iPAQ hx47xx #@DESCRIPTION: Machine configuration for the hx4700 iPAQ with a pxa27x CPU # @@ -19,7 +19,9 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "200" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 pcmcia screen touchscreen usbgadget wifi vfat" MACHINE_FEATURES += "iwmmxt" # @@ -35,13 +37,13 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "\ - kernel-module-i2c-pxa \ - kernel-module-pxa27x-voltage \ - kernel-module-pxa27x-voltage-max158xx \ - kernel-module-acx \ - kernel-module-hx4700-acx \ - kernel-module-hx4700-bt \ - kernel-module-snd-hx4700-audio" + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ + kernel-module-acx \ + kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ + kernel-module-snd-hx4700-audio" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc deleted file mode 100644 index f22ffce6c2..0000000000 --- a/conf/machine/include/collie-2.6.inc +++ /dev/null @@ -1,6 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "linux-rp" - -SERIAL_CONSOLE = "115200 ttySA0" -MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscreen wifi" - -MACHINE_EXTRA_RDEPENDS = "kernel-modules" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 6e7d303586..924fb54f1e 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -3,11 +3,11 @@ #@DESCRIPTION: genric machine configuration for ixp4xx platforms # Set default for common ixp4xx-based machines -MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex" +MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex" # Select an appropriate default kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" -PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.23.14+svnr${SRCREV}" # Add packages required for basic networking support MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 87571c0db0..da88b1494f 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -11,8 +11,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" #mtd2: 00580000 00020000 "VFM_Filesystem" #mtd3: 00020000 00020000 "Logo" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" -MACHINE_FEATURES += "iwmmxt" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen phone" +MACHINE_FEATURES += " iwmmxt" MACHINE_DISPLAY_WIDTH_PIXELS = "240" diff --git a/conf/machine/include/palm.inc b/conf/machine/include/palm.inc index 5eb7806f6f..22c6ad4233 100644 --- a/conf/machine/include/palm.inc +++ b/conf/machine/include/palm.inc @@ -10,7 +10,7 @@ SERIAL_CONSOLE = "115200 ttyS0" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2 vfat" # # Software/packages selection diff --git a/conf/machine/include/poodle-2.6.inc b/conf/machine/include/poodle-2.6.inc deleted file mode 100644 index fa24a3281b..0000000000 --- a/conf/machine/include/poodle-2.6.inc +++ /dev/null @@ -1 +0,0 @@ -require conf/machine/include/zaurus-2.6.inc diff --git a/conf/machine/include/qemu.inc b/conf/machine/include/qemu.inc index d84f1efb26..26d1e3f8ca 100644 --- a/conf/machine/include/qemu.inc +++ b/conf/machine/include/qemu.inc @@ -1,7 +1,6 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed" MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc index 8654c996ef..448b28c91f 100644 --- a/conf/machine/include/tune-strongarm.inc +++ b/conf/machine/include/tune-strongarm.inc @@ -1,2 +1,6 @@ -TARGET_CC_ARCH = "-march=armv4 -mtune=xscale" +# This machine lists common configuration options for Strongarm devices +# gcc does not differentiate between the different Strongarm versions, so neither do we +# http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-January/004031.html + +TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 7e41da0783..f6d1ec0d8e 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -1,8 +1,9 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.inc as well +# Zaurus specific configuration for kernel 2.6 +# Additionally, clamshell specific stuff in zaurus-clamshell.inc TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +PACKAGE_EXTRA_ARCHS_collie = "" MACHINE_KERNEL_VERSION = "2.6" @@ -10,23 +11,18 @@ ERASEBLOCKSIZE = "0x4000" ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" - IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" - EXTRA_IMAGEDEPENDS += "zaurus-updater" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.inc - SERIAL_CONSOLE = "115200 ttyS0" +SERIAL_CONSOLE_collie = "115200 ttySA0" PREFERRED_PROVIDER_virtual/kernel = "linux-rp" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost ext2 " @@ -36,11 +32,16 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-px MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" +MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \ + kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_collie = "smallscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" +KERNEL_IMAGE_MAXSIZE = "1294336" +KERNEL_IMAGE_MAXSIZE_collie = "1048576" + MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" zaurus_make_installkit () { @@ -49,7 +50,7 @@ zaurus_make_installkit () { mkdir ${IMAGE_NAME}-installkit/ # Get the latest kernel using the zImage-<machine>.bin symlink - cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage if [ "${MACHINE}" = "spitz" ]; then cp gnu-tar ${IMAGE_NAME}-installkit/ diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index f66502eff1..4fa9f75eb3 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,3 +1,5 @@ +include conf/machine/include/tune-xscale.inc + EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf deleted file mode 100644 index 0a1e54c324..0000000000 --- a/conf/machine/ixp4xx.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: Generic IXP4XX kernel -#@DESCRIPTION: Machine configuration for a generic ixp4xx board - -MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')} diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index a322f1a60c..3735bc0312 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -9,4 +9,4 @@ require conf/machine/include/tune-sh3.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 461d0c8326..8741eb4ff6 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -8,5 +8,5 @@ require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda keyboard touchscreen screen vfat" MACHINE_EXTRA_RDEPENDS = "kernel-modules" diff --git a/conf/machine/looxc550.conf b/conf/machine/looxc550.conf index f4fd23eec9..1792cda280 100644 --- a/conf/machine/looxc550.conf +++ b/conf/machine/looxc550.conf @@ -15,7 +15,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index e099825a40..ac565559aa 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -21,15 +21,9 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "142" -MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost vfat" MACHINE_FEATURES += "iwmmxt" - -# -# We don't support jffs2 installations (yet). -# -IMAGE_FSTYPES = "tar.bz2" - # # Software/packages selection # @@ -44,32 +38,31 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-i2c-pxa \ kernel-module-pxa27x-voltage \ kernel-module-pxa27x-voltage-max158xx \ - kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-magician-flash \ - kernel-module-magician-ds1wm \ - kernel-module-magician-battery \ kernel-module-magician-phone \ kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" +#write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there +EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 256KiB -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" + # # Modules autoload and other boot properties # -module_autoload_magician_ts = "magician_ts" -module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_hci_usb = "hci_usb" module_autoload_pxa27x_udc = "pxa27x_udc" -module_autoload_magician_ds1wm = "magician_ds1wm" -module_autoload_magician-battery = "magician-battery" +module_autoload_magician_ts = "magician_ts" +module_autoload_leds-magician = "leds-magician" module_autoload_magician_phone = "magician_phone" module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" -module_autoload_hci_usb = "hci_usb" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index a6681a9030..af3e5a5cc3 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -15,6 +15,7 @@ require conf/machine/include/tune-xscale.inc SERIAL_CONSOLE = "115200 ttyS0" # used by opie-collections.inc -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE = "16" MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000" diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 81c3e29e91..3bc18e3f9e 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -10,7 +10,7 @@ PREFERRED_VERSION_u-boot = "git" MACHINE_FEATURES = "kernel26 usbhost ext2" -PREFERRED_VERSION_u-boot = "1.3.0" +PREFERRED_VERSION_u-boot = "1.3.1" UBOOT_MACHINE = "MPC8313ERDB_33_config" #rootfs on NAND flash diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf new file mode 100644 index 0000000000..c918404d6c --- /dev/null +++ b/conf/machine/mx31moboard.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@Name: EPFL mx31MoBoard +#@DESCRIPTION: Machine configuration for EPFL MX31MoBoard +#@Website: http://mobots.epfl.ch/mx31MoBoard.html + +TARGET_ARCH = "arm" +TARGET_FPU_arm = "hard" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" + +GUI_MACHINE_CLASS = "smallscreen" +PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/kernel = "linux" + +require conf/machine/include/tune-arm1136jf-s.inc + +# +# usb networking +# +module_conf_g_ether = "alias usb0 g_ether" + +# used by sysvinit_2 +SERIAL_CONSOLE = "-L 115200 ttymxc0 vt100" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "32" + +# to avoid annoying jffs2 messages +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000" + +IMAGE_FSTYPES += "tar.gz" + diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index 1c9fc7af9d..330a1287e4 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -15,7 +15,7 @@ USE_VT = "0" #use the epson xserver XSERVER = "xserver-kdrive-epson" -MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen" +MACHINE_FEATURES = "kernel26 touchscreen keyboard apm alsa pcmcia bluetooth irda usbhost screen vfat" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0 vt100" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 0e308b0a67..4e36c6d38a 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -12,6 +12,8 @@ XSERVER = "xserver-kdrive-xomap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "800" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-arm926ejs.inc @@ -30,7 +32,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost screen vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" # build tools diff --git a/conf/machine/nokia800.conf b/conf/machine/nokia800.conf index 703fc1984d..144df2ed08 100644 --- a/conf/machine/nokia800.conf +++ b/conf/machine/nokia800.conf @@ -8,6 +8,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" XSERVER = "xserver-kdrive-xomap" GUI_MACHINE_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "800" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" TARGET_FPU = "hard" include conf/machine/include/tune-arm1136jf-s.inc @@ -24,7 +26,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-nokia800" #use this if you are using the nokia initfs ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost vfat" MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "nokia770-init" # build tools diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf deleted file mode 100644 index 7e45825f69..0000000000 --- a/conf/machine/nslu2.conf +++ /dev/null @@ -1,5 +0,0 @@ -#@TYPE: Machine -#@NAME: Linksys NSLU2 -#@DESCRIPTION: Machine configuration for the Linksys NSLU2 product - -MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')} diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 3162eb3342..360e397e04 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "armeb" PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe" -MACHINE_ARCH = "ixp4xxbe" - OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ROOT_FLASH_SIZE ?= "6" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 1aced19de2..1ad9bdd96a 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -6,8 +6,6 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle" -MACHINE_ARCH = "ixp4xxle" - OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ROOT_FLASH_SIZE ?= "6" diff --git a/conf/machine/qemux86.conf b/conf/machine/qemux86.conf index fe811ba54e..7fbdbfb1a7 100644 --- a/conf/machine/qemux86.conf +++ b/conf/machine/qemux86.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation TARGET_ARCH = "i586" +TARGET_CC_ARCH = "-march=i586" PACKAGE_EXTRA_ARCHS = "x86" require conf/machine/include/qemu.inc diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf index ba2c956d87..f8ca7ec033 100644 --- a/conf/machine/rx1950.conf +++ b/conf/machine/rx1950.conf @@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat # # Software/packages selection diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index 4b3acc0a85..2531f984f0 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -16,7 +16,7 @@ VOLATILE_STORAGE_SIZE = "64" MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat" # # Software/packages selection diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index ab3da912ba..6334d34171 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -6,7 +6,7 @@ MACHINE_KERNEL_VERSION ?= "2.6" TARGET_ARCH = "arm" -MACHINE_FEATURES = " apm pcmcia irda screen touchscreen " +MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc require conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 519c565061..5b69bbdc9a 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,23 +1,27 @@ TARGET_ARCH = "powerpc" -TARGET_OS = "linux" TARGET_FPU = "hard" -PACKAGE_EXTRA_ARCHS = "ppc ppc603e" - -INHERIT += "storcenter-image" +PACKAGE_EXTRA_ARCHS = "ppc603e" # terminal specs - console, but no other ports -SERIAL_CONSOLE="115200 console" +SERIAL_CONSOLE="115200 ttyS0" USE_VT="0" -MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot" +# uboot switches +UBOOT_MACHINE="Sandpoint8240_config" + +# plug in other tasks - not "really" used unless we are using task-boot +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" +PREFERRED_VERSION_udev = "115" -# We want udev support in the image -udevdir = "/dev" +# the StorCenter Control Daemon provides cmdline fan and light control +MACHINE_EXTRA_RDEPENDS = "sccd" -EXTRA_IMAGECMD = "--big-endian" -ERASEBLOCK_SIZE = "0x10000" IMAGE_FSTYPES = "jffs2" +KERNEL_IMAGETYPE ?= uImage +EXTRA_IMAGECMD_jffs2 += "--pad --big-endian --eraseblock=0x10000" +# must be in HEX +FLASH_KERNEL_SIZE=0x170000 +FLASH_ROOT_SIZE=0x590000 require conf/machine/include/tune-ppc603e.inc |