diff options
Diffstat (limited to 'conf')
82 files changed, 1057 insertions, 206 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ac2d281123..858e411d8c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -176,14 +176,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" -RDEPENDS_${PN}-dev = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" +RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})" FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" +RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})" FILES_${PN}-locale = "${datadir}/locale" @@ -216,18 +216,19 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/staging" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" -STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin" -STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}" -STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib" -STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include" -STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc" -STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share" +STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}" +STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}" +STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}" +STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}" +STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}" +STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}" STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}" -STAGING_BINDIR = "${STAGING_DIR_HOST}/bin" -STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib" -STAGING_INCDIR = "${STAGING_DIR_HOST}/include" -STAGING_DATADIR = "${STAGING_DIR_HOST}/share" +STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" +STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" +STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" +STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" +STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" @@ -310,7 +311,7 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi # Build utility info. ################################################################## -CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" +CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}" TOOLCHAIN_OPTIONS = "" export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" @@ -351,10 +352,12 @@ PATCHRESOLVE = 'noop' ################################################################## export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}" +BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}" export CPPFLAGS = "${TARGET_CPPFLAGS}" -export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include" +export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}" export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}" +BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}" export CFLAGS = "${TARGET_CFLAGS}" export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}" @@ -365,9 +368,14 @@ export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" + +BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ + -Wl,-rpath-link,${STAGING_LIBDIR} \ + -Wl,-rpath,${libdir} -Wl,-O1" + export LDFLAGS = "${TARGET_LDFLAGS}" -export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \ - -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \ +export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \ + -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \ -Wl,-O1" # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? @@ -529,6 +537,10 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL include conf/site.conf include conf/auto.conf include conf/local.conf +# USERDISTRO should always contain original DISTRO value as set by user +# If a distro config overrides DISTRO for whatever reason (e.g. to get +# overrides like it wants), USERDISTRO must be reassigned with := first +USERDISTRO = "${DISTRO}" include conf/build/${BUILD_SYS}.conf include conf/target/${TARGET_SYS}.conf include conf/machine/${MACHINE}.conf @@ -541,7 +553,7 @@ require conf/sanity.conf ################################################################## DL_DIR ?= "${TMPDIR}/downloads" -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES ?= "tar.gz" PCMCIA_MANAGER ?= "pcmcia-cs" DEFAULT_TASK_PROVIDER ?= "task-base" MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" diff --git a/conf/checksums.ini b/conf/checksums.ini index 8ff6bd69fc..b2878021a9 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 @@ -1294,6 +1298,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 @@ -1342,6 +1366,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 @@ -1530,9 +1558,9 @@ sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057 md5=c0b57a115e24005f9828ca7b53908779 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd -[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz] -md5=4476c423b8f74266136964e42ea88028 -sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56 +[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 @@ -2418,6 +2446,14 @@ sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce 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 @@ -3090,6 +3126,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 @@ -3258,6 +3298,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 @@ -3266,6 +3310,10 @@ sha256=6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d md5=fca5d26c8efea4e6e547c81c801bf67c sha256=bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97 +[http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-2.14.4.tar.bz2] +md5=7ee7874108cbe9ea7fff1f4ab3389ce8 +sha256=10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff + [http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-2.2.3.tar.bz2] md5=aa214a10d873b68ddd67cd9de2ccae55 sha256=af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5 @@ -3306,10 +3354,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 @@ -3326,6 +3382,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 @@ -4422,6 +4482,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 @@ -4974,6 +5038,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 @@ -5374,6 +5442,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 @@ -5426,6 +5498,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 @@ -5498,6 +5574,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 @@ -5622,6 +5702,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 @@ -5694,6 +5778,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 @@ -5706,6 +5794,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 @@ -6562,6 +6654,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 @@ -6746,6 +6842,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 @@ -6834,6 +6934,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 @@ -6902,6 +7006,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 @@ -8794,7 +8902,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 @@ -9546,6 +9654,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 @@ -9646,6 +9758,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 @@ -12742,6 +12858,10 @@ sha256=652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8 md5=bb196907ea1e182dcb396eb22f7d2c1a sha256=e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085 +[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.4.tar.bz2] +md5=8b36cdf08df12be96615e3d550236626 +sha256=765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/xtrans-X11R7.0-1.0.0.tar.bz2] md5=153642136a003871a9093c8103d6ac5a sha256=c9a049b4367318b53cbad02bc7e3c4450778e3237400a515b2a6272405b8b912 diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf index 25b07e0038..7935672795 100644 --- a/conf/distro/amsdelta-oe.conf +++ b/conf/distro/amsdelta-oe.conf @@ -1,4 +1,3 @@ -DISTRO = "amsdelta-oe" DISTRO_NAME = "AmsDelta Linux" DISTRO_VERSION = "unstable-${DATE}" diff --git a/conf/distro/angstrom-2007.1-legacy.conf b/conf/distro/angstrom-2008.1-legacy.conf index 358ed06cf2..358ed06cf2 100644 --- a/conf/distro/angstrom-2007.1-legacy.conf +++ b/conf/distro/angstrom-2008.1-legacy.conf diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index ec8a5b9b30..b24a57f537 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -22,6 +22,7 @@ DISTRO_REVISION = "1" require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc +require conf/distro/include/angstrom-2008-preferred-versions.inc #Images built can have to modes: # 'debug': empty rootpassword, strace included @@ -71,15 +72,9 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29" #Prefer a newer GTK+ and friends -PREFERRED_VERSION_gtk+ = "2.12.0" -PREFERRED_VERSION_glib-2.0 = "2.14.0" -PREFERRED_VERSION_pango = "1.18.1" - -# prefer newest for speed and fun -PREFERRED_VERSION_udev = "115" - -# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable -PREFERRED_VERSION_busybox = "1.7.2" +PREFERRED_VERSION_gtk+ ?= "2.12.3" +PREFERRED_VERSION_glib-2.0 ?= "2.14.4" +PREFERRED_VERSION_pango ?= "1.18.1" PREFERRED_PROVIDER_avahi = "avahi" diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf new file mode 100644 index 0000000000..c439ad67f6 --- /dev/null +++ b/conf/distro/chinook-compat.conf @@ -0,0 +1,199 @@ +#@-------------------------------------------------------------------- +#@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_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" + +# 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_VERSION_bluez-libs = "3.20" + +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_VERSION_libsdl-directfb = "1.2.9" +PREFERRED_VERSION_libsdl-image = "1.2.3" + +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" + +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" + +# various Maemo4 specific libraries +PREFERRED_VERSION_mce-dev = "1.6.3" +PREFERRED_VERSION_libosso = "2.13" +PREFERRED_VERSION_libhildon = "1.99.0" +PREFERRED_VERSION_libhildonmime = "1.10.0" +PREFERRED_VERSION_libhildonfm = "1.9.46" +PREFERRED_VERSION_hildon-thumbnail = "0.14" +PREFERRED_VERSION_osso-gwconnect = "1.0.12" +PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3" + +# Java stuff + +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" + +PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon" +PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5" + +# 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" + +PKG_libsdl-image = "libsdl-image1.2" +PKG_libsdl-directfb = "libsdl1.2" + +PKG_bluez-libs = "libbluetooth2" + +PKG_osso-ic-oss = "osso-ic" +PKG_libconic = "libconic0" diff --git a/conf/distro/colinuxoe.conf b/conf/distro/colinuxoe.conf index 7454c0167f..25ea04a1f5 100644 --- a/conf/distro/colinuxoe.conf +++ b/conf/distro/colinuxoe.conf @@ -2,6 +2,8 @@ #@NAME: coLinuxoe #@DESCRIPTION: Generic OE built distro for the coLinux MACHINE +TARGET_OS = "linux" + INHERIT += "package_ipk debian" # MACHINE decides that linux-colinux is the correct kernel. diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index fe079db92d..8e26a282ab 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -10,7 +10,6 @@ FOONAS_MODE ?= "glibc" ANGSTROM_MODE = ${FOONAS_MODE} require conf/distro/angstrom-2008.1.conf -DISTRO = "foonas" DISTRO_NAME = "foonas" DISTRO_VERSION = "1.0-dev" DISTRO_REVISION = "1" diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/generic-uclibc.conf index 26e78f89c1..805cfe7955 100644 --- a/conf/distro/generic-uclibc.conf +++ b/conf/distro/generic-uclibc.conf @@ -27,3 +27,10 @@ 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" + +USE_NLS ?= "no" +USE_NLS_glib-2.0 = "yes" + +PREFERRED_VERSION_uclibc = "0.9.29" +PREFERRED_VERSION_uclibc-initial = "0.9.29" + diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 0286666495..d67be1d738 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -36,28 +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/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +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" @@ -65,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/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc index 156b5b21a3..6cabe8164c 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko-versions.inc @@ -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" @@ -548,7 +548,7 @@ PREFERRED_VERSION_gpe-irc ?= "0.08" PREFERRED_VERSION_gpe-keylock ?= "0.12" PREFERRED_VERSION_gpe-life ?= "0.2" PREFERRED_VERSION_gpe-lights ?= "0.13" -PREFERRED_VERSION_gpe-login ?= "0.90" +PREFERRED_VERSION_gpe-login ?= "0.91" PREFERRED_VERSION_gpe-mini-browser ?= "0.21" PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17" PREFERRED_VERSION_gpe-mininet ?= "0.7" @@ -886,7 +886,7 @@ PREFERRED_VERSION_libgalago ?= "0.3.3" PREFERRED_VERSION_libgc ?= "6.7" PREFERRED_VERSION_libgcrypt ?= "1.2.3" PREFERRED_VERSION_libgeda ?= "20050820" -PREFERRED_VERSION_libgemwidget ?= "0.1" +PREFERRED_VERSION_libgemwidget ?= "1.0" PREFERRED_VERSION_libglade ?= "2.6.2" PREFERRED_VERSION_libglademm ?= "2.4.1" PREFERRED_VERSION_libgmime ?= "2.1.7" @@ -918,7 +918,7 @@ PREFERRED_VERSION_libhildonfm ?= "1.9.41" PREFERRED_VERSION_libhildonhelp ?= "1.9.1" PREFERRED_VERSION_libhildonmime ?= "1.9.5" PREFERRED_VERSION_libhtml-mason-perl ?= "1.35" -PREFERRED_VERSION_libiac ?= "0.1" +PREFERRED_VERSION_libiac ?= "1.0" PREFERRED_VERSION_libice ?= "1.0.4" PREFERRED_VERSION_libiconv ?= "1.11" PREFERRED_VERSION_libid3 ?= "1.1" @@ -946,7 +946,7 @@ PREFERRED_VERSION_libmailwrapper ?= "1.2.3" PREFERRED_VERSION_libmatchbox ?= "1.9" PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18" PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" -PREFERRED_VERSION_libmimedir ?= "0.3.1" +PREFERRED_VERSION_libmimedir ?= "0.4.2" PREFERRED_VERSION_libmng ?= "1.0.8" PREFERRED_VERSION_libmodplug ?= "0.7" PREFERRED_VERSION_libmodule-build-perl ?= "0.2805" diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc index 380c882c2c..08cf27ba57 100644 --- a/conf/distro/include/angstrom-2007-for-openmoko.inc +++ b/conf/distro/include/angstrom-2007-for-openmoko.inc @@ -146,7 +146,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-xorg-versions.inc -require conf/distro/include/angstrom-2007-preferred-versions.inc +require conf/distro/include/angstrom-2007-for-openmoko-versions.inc require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc new file mode 100644 index 0000000000..b8685a578e --- /dev/null +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -0,0 +1,8 @@ +PREFERRED_VERSION_dbus = "1.1.4" +PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.5.10" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_vte = "0.16.10" + diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 1502833389..d14c6f1b19 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -3,6 +3,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" 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 aff3ba90d1..d55b5bf3db 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -2,6 +2,8 @@ #@NAME: Angstrom #@DESCRIPTION: Release independent distribution configuration for Angstrom +# Preserve original DISTRO value +USERDISTRO := "${DISTRO}" DISTRO = "angstrom" DISTRO_NAME = "Angstrom" @@ -10,6 +12,7 @@ TARGET_VENDOR = "-angstrom" # Can be "glibc", "eglibc" or "uclibc" ANGSTROM_MODE ?= "glibc" +CACHE = "${TMPDIR}/cache/${ANGSTROM_MODE}/${MACHINE}" DEPLOY_DIR = "${TMPDIR}/deploy/${ANGSTROM_MODE}" require conf/distro/include/angstrom-${ANGSTROM_MODE}.inc @@ -50,6 +53,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 diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index e039a144d3..f9941c8a9a 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -9,6 +9,7 @@ SRCREV_pn-ezxd ?= "${AUTOREV}" SRCREV_pn-fbgrab-viewer-native ?= "${AUTOREV}" SRCREV_pn-fstests ?= "${AUTOREV}" SRCREV_pn-gnuradio ?= "${AUTOREV}" +SRCREV_pn-gtkhtml2 ?= "${AUTOREV}" SRCREV_pn-hildon-1 ?= "${AUTOREV}" SRCREV_pn-kismet ?= "${AUTOREV}" SRCREV_pn-kismet-newcore ?= "${AUTOREV}" @@ -81,6 +82,8 @@ SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" SRCREV_pn-psplash ?= "${AUTOREV}" SRCREV_pn-settings-daemon ?= "${AUTOREV}" SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index fb9e2815ba..55e51409be 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -32,7 +32,7 @@ PREFERRED_VERSION_libxsettings-client ?= "0.17" PREFERRED_VERSION_gpe-icons ?= "0.25" -PREFERRED_VERSION_gpe-login ?= "0.90" +PREFERRED_VERSION_gpe-login ?= "0.91" PREFERRED_VERSION_gpe-session-scripts ?= "0.67" PREFERRED_VERSION_gpe-su ?= "0.19" PREFERRED_VERSION_keylaunch ?= "2.0.10" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index d7209be624..b801536586 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,7 +1,13 @@ -PREFERRED_VERSION_vte = "0.16.10" -PREFERRED_VERSION_dbus = "1.1.1" -PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_asterisk = "1.4.17" +PREFERRED_VERSION_busybox = "1.9.1" +PREFERRED_VERSION_dbus = "1.1.4" PREFERRED_VERSION_gnash = "0.8.1" +PREFERRED_VERSION_gpsdrive = "2.10pre4" +PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_libtool = "1.5.24" PREFERRED_VERSION_mono = "1.2.6" PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6" +PREFERRED_VERSION_mono-native = "1.2.6" +PREFERRED_VERSION_pulseaudio = "0.9.9" +PREFERRED_VERSION_udev = "118" +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/preferred-xorg-versions-X11R7.0.inc b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc index 6db9d92f71..5a391aa45a 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.0.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.0.inc @@ -339,3 +339,9 @@ PREFERRED_VERSION_util-macros-native = "X11R7.0-1.0.1" PREFERRED_VERSION_util-macros = "X11R7.0-1.0.1" PREFERRED_VERSION_xorg-cf-files = "X11R7.0-1.0.1" PREFERRED_VERSION_xserver-xorg = "X11R7.0-1.0.1" + +# Unreleased Packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 782549589d..c387161577 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -183,3 +183,9 @@ PREFERRED_VERSION_util-macros ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "X11R7.1-1.1.0" PREFERRED_VERSION_xserver-xorg ?= "X11R7.1-1.1.0" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc index 59a481a104..dc34a99340 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -269,3 +269,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" PREFERRED_VERSION_xserver-xorg ?= "1.2.0" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc index d7e19284bc..648472e9b6 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.3.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.3.inc @@ -280,3 +280,8 @@ PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" PREFERRED_VERSION_xserver-kdrive ?= "1.4" PREFERRED_VERSION_xserver-xorg ?= "1.4" +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc new file mode 100644 index 0000000000..4af2405aa7 --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -0,0 +1,292 @@ +# see http://www.x.org/wiki/Releases/7.4 +# WORK IN PROGRESS, 7.4 will be released on 2008-03-01 + +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" + +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" + +PREFERRED_VERSION_task-xorg ?= "X11R7.4" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "1.0.1" +PREFERRED_VERSION_beforelight ?= "1.0.3" +PREFERRED_VERSION_bitmap ?= "1.0.3" +PREFERRED_VERSION_editres ?= "1.0.3" +PREFERRED_VERSION_fontosfnt ?= "1.0.3" +PREFERRED_VERSION_fslsfonts ?= "1.0.1" +PREFERRED_VERSION_fstobdf ?= "1.0.2" +PREFERRED_VERSION_iceauth ?= "1.0.2" +PREFERRED_VERSION_ico ?= "1.0.2" +PREFERRED_VERSION_lbxproxy ?= "1.0.1" +PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_luit ?= "1.0.3" +PREFERRED_VERSION_mkfontdir-native ?= "1.0.3" +PREFERRED_VERSION_mkfontdir ?= "1.0.3" +PREFERRED_VERSION_mkfontscale ?= "1.0.3" +PREFERRED_VERSION_oclock ?= "1.0.1" +PREFERRED_VERSION_proxymngr ?= "1.0.1" +PREFERRED_VERSION_rgb ?= "1.0.1" +PREFERRED_VERSION_rstart ?= "1.0.2" +PREFERRED_VERSION_scripts ?= "1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.3" +PREFERRED_VERSION_setxkbmap ?= "1.0.4" +PREFERRED_VERSION_smproxy ?= "1.0.2" +PREFERRED_VERSION_twm ?= "1.0.3" +PREFERRED_VERSION_viewres ?= "1.0.1" +PREFERRED_VERSION_x11perf ?= "1.4.1" +PREFERRED_VERSION_xauth ?= "1.0.2" +PREFERRED_VERSION_xbacklight ?= "1.1" +PREFERRED_VERSION_xbiff ?= "1.0.1" +PREFERRED_VERSION_xcalc ?= "1.0.2" +PREFERRED_VERSION_xclipboard ?= "1.0.1" +PREFERRED_VERSION_xclock ?= "1.0.3" +PREFERRED_VERSION_xcmsdb ?= "1.0.1" +PREFERRED_VERSION_xconsole ?= "1.0.3" +PREFERRED_VERSION_xcursorgen ?= "1.0.2" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.6" +PREFERRED_VERSION_xdpyinfo ?= "1.0.2" +PREFERRED_VERSION_xdriinfo ?= "1.0.2" +PREFERRED_VERSION_xedit ?= "1.0.2" +PREFERRED_VERSION_xev ?= "1.0.2" +PREFERRED_VERSION_xeyes ?= "1.0.1" +PREFERRED_VERSION_xxf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "1.0.1" +PREFERRED_VERSION_xfindproxy ?= "1.0.1" +PREFERRED_VERSION_xfontsel ?= "1.0.2" +PREFERRED_VERSION_xfs ?= "1.0.5" +PREFERRED_VERSION_xfsinfo ?= "1.0.1" +PREFERRED_VERSION_xfwp ?= "1.0.1" +PREFERRED_VERSION_xgamma ?= "1.0.2" +PREFERRED_VERSION_xgc ?= "1.0.1" +PREFERRED_VERSION_xhost ?= "1.0.2" +PREFERRED_VERSION_xinit ?= "1.0.7" +PREFERRED_VERSION_xinput ?= "1.3.0" +PREFERRED_VERSION_xkbcomp ?= "1.0.3" +PREFERRED_VERSION_xkbevd ?= "1.0.2" +PREFERRED_VERSION_xkbprint ?= "1.0.1" +PREFERRED_VERSION_xkbutils ?= "1.0.1" +PREFERRED_VERSION_xkill ?= "1.0.1" +PREFERRED_VERSION_xload ?= "1.0.2" +PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlsatoms ?= "1.0.1" +PREFERRED_VERSION_xlsclients ?= "1.0.1" +PREFERRED_VERSION_xlsfonts ?= "1.0.2" +PREFERRED_VERSION_xmag ?= "1.0.2" +PREFERRED_VERSION_xman ?= "1.0.3" +PREFERRED_VERSION_xmessage ?= "1.0.2" +PREFERRED_VERSION_xmh ?= "1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.3" +PREFERRED_VERSION_xmore ?= "1.0.1" +PREFERRED_VERSION_xphelloworld ?= "1.0.1" +PREFERRED_VERSION_xplsprinters ?= "1.0.1" +PREFERRED_VERSION_xpr ?= "1.0.2" +PREFERRED_VERSION_xprehashprinterlist ?= "1.0.1" +PREFERRED_VERSION_xprop ?= "1.0.3" +PREFERRED_VERSION_xrandr ?= "1.2.2" +PREFERRED_VERSION_xrdb ?= "1.0.4" +PREFERRED_VERSION_xrefresh ?= "1.0.2" +PREFERRED_VERSION_xrx ?= "1.0.1" +PREFERRED_VERSION_xset ?= "1.0.3" +PREFERRED_VERSION_xsetmode ?= "1.0.0" +PREFERRED_VERSION_xsetpointer ?= "1.0.1" +PREFERRED_VERSION_xsetroot ?= "1.0.2" +PREFERRED_VERSION_xsm ?= "1.0.1" +PREFERRED_VERSION_xstdcmap ?= "1.0.1" +PREFERRED_VERSION_xtrap ?= "1.0.2" +PREFERRED_VERSION_xvidtune ?= "1.0.1" +PREFERRED_VERSION_xvinfo ?= "1.0.2" +PREFERRED_VERSION_xwd ?= "1.0.1" +PREFERRED_VERSION_xwininfo ?= "1.0.3" +PREFERRED_VERSION_xwud ?= "1.0.1" + +# data +PREFERRED_VERSION_xbitmaps ?= "1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "1.4" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2" + +# driver +PREFERRED_VERSION_xf86-input-acecad ?= "1.2.1" +PREFERRED_VERSION_xf86-input-aiptek ?= "1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "1.1.1" +PREFERRED_VERSION_xf86-input-citron ?= "2.2.1" +PREFERRED_VERSION_xf86-input-digitaledge ?= "1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "1.1.1" +PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.1" +PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.1" +PREFERRED_VERSION_xf86-input-elographics ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-evdev ?= "1.2.0" +PREFERRED_VERSION_xf86-input-fpit ?= "1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "1.3.1" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2" +PREFERRED_VERSION_xf86-input-magellan ?= "1.1.1" +PREFERRED_VERSION_xf86-input-magictouch ?= "1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.2.3" +PREFERRED_VERSION_xf86-input-mutouch ?= "1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.2.1" +PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" +PREFERRED_VERSION_xf86-input-summa ?= "1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "12.4.3" +PREFERRED_VERSION_xf86-input-void ?= "1.1.1" +PREFERRED_VERSION_xf86-video-apm ?= "1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.6.193" +PREFERRED_VERSION_xf86-video-chips ?= "1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" +PREFERRED_VERSION_xf86-video-glide ?= "1.0.0" +PREFERRED_VERSION_xf86-video-glint ?= "1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" +PREFERRED_VERSION_xf86-video-i740 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" +PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0" +PREFERRED_VERSION_xf86-video-intel ?= "2.2.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.8" +PREFERRED_VERSION_xf86-video-neomagic ?= "1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.7" +PREFERRED_VERSION_xf86-video-radeonhd ?= "1.1.0" +PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.1.3" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" +PREFERRED_VERSION_xf86-video-sis ?= "0.9.4" +PREFERRED_VERSION_xf86-video-sisusb ?= "0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tga ?= "1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "0.1.1" +PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.0" +PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.15.2" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" + +# font +PREFERRED_VERSION_encodings ?= "1.0.2" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-util-native ?= "1.0.1" +PREFERRED_VERSION_font-util ?= "1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.3" +PREFERRED_VERSION_libdmx ?= "1.0.2" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libice ?= "1.0.4" +PREFERRED_VERSION_liblbxutil ?= "1.0.1" +PREFERRED_VERSION_libsm ?= "1.0.3" +PREFERRED_VERSION_libx11 ?= "1.1.3" +PREFERRED_VERSION_libx11-native ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxaw ?= "1.0.4" +PREFERRED_VERSION_libxcomposite ?= "0.4.0" +PREFERRED_VERSION_libxcursor ?= "1.1.9" +PREFERRED_VERSION_libxdamage ?= "1.0.4" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.2" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.0.3" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.3.1" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxi ?= "1.1.3" +PREFERRED_VERSION_libxinerama ?= "1.0.2" +PREFERRED_VERSION_libxkbfile ?= "1.0.4" +PREFERRED_VERSION_libxkbui ?= "1.0.2" +PREFERRED_VERSION_libxmu ?= "1.0.4" +PREFERRED_VERSION_libxpm ?= "3.5.7" +PREFERRED_VERSION_libxrandr ?= "1.2.2" +PREFERRED_VERSION_libxrender ?= "0.9.4" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" +PREFERRED_VERSION_libxt ?= "1.0.5" +PREFERRED_VERSION_libxtst ?= "1.0.3" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +PREFERRED_VERSION_libxxf86dga ?= "1.0.2" +PREFERRED_VERSION_libxxf86misc ?= "1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "1.0.1" +PREFERRED_VERSION_xtrans ?= "1.0.4" + +# proto +PREFERRED_VERSION_compositeproto ?= "0.4" +PREFERRED_VERSION_damageproto ?= "1.1.0" +PREFERRED_VERSION_fixesproto ?= "4.0" +PREFERRED_VERSION_glproto ?= "1.4.9" +PREFERRED_VERSION_inputproto ?= "1.4.2.1" +PREFERRED_VERSION_kbproto ?= "1.0.3" +PREFERRED_VERSION_randrproto ?= "1.2.1" +PREFERRED_VERSION_renderproto ?= "0.9.3" +PREFERRED_VERSION_scrnsaverproto ?= "1.1.0" +PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" +PREFERRED_VERSION_xproto-native ?= "7.0.11" +PREFERRED_VERSION_xproto ?= "7.0.11" + +# util +PREFERRED_VERSION_gccmakedep ?= "1.0.2" +PREFERRED_VERSION_imake ?= "1.0.2" +PREFERRED_VERSION_makedepend ?= "1.0.1" +PREFERRED_VERSION_util-macros-native ?= "1.1.5" +PREFERRED_VERSION_util-macros ?= "1.1.5" +PREFERRED_VERSION_xorg-cf-files ?= "1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.4" +PREFERRED_VERSION_xserver-xorg ?= "1.4" + +# Unreleased packages +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index f34b29f147..05136138fc 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -109,3 +109,7 @@ PREFERRED_VERSION_xtrans ?= "1.0.3" PREFERRED_VERSION_xtrans-native ?= "1.0.3" PREFERRED_VERSION_xinit ?= "1.0.4" PREFERRED_VERSION_xev ?= "1.0.2" +SRCREV_pn-libxcalibrate ?= "7b8e29186097170e930de634a4a68072558aa056" +PV_pn-libxcalibrate ?= "0.0-oe1-${SRCREV}" +SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +PV_pn-calibrateproto ?= "0.0-oe1-${SRCREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index cff6d7316b..5a1e8f2758 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,14 +46,13 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080117" +EFL_SRCDATE = "20080216" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" @@ -107,9 +106,9 @@ SRCDATE_entice ?= "${EFL_SRCDATE}" SRCDATE_entrance ?= "${EFL_SRCDATE}" SRCDATE_e-utils ?= "${EFL_SRCDATE}" SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna = "${EFL_SRCDATE}" -#SRCDATE_enna ?= "${EFL_SRCDATE}" +SRCDATE_enna ?= "${EFL_SRCDATE}" SRCDATE_exquisite ?= "${EFL_SRCDATE}" +SRCDATE_rage ?= "${EFL_SRCDATE}" # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 46c90976c8..0cf1788c8c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -7,6 +7,10 @@ # this is alphabetical! +# yes, really! + +# you know what that means? like... a, b, c, d, e, f, g... + SRCREV_pn-aircrack-ng ?= "802" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" @@ -23,10 +27,12 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" -SRCREV_pn-gconf-dbus ?= "638" +SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "42" +SRCREV_pn-gpio ?= "4112" +SRCREV_pn-gsm0710muxd ?= "77" +SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "56" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-kismet ?= "2285" @@ -40,12 +46,14 @@ SRCREV_pn-libmokogsmd2 ?= "3663" SRCREV_pn-libmokojournal2 ?= "3217" SRCREV_pn-libmokopanelui2 ?= "3349" SRCREV_pn-libmokoui2 ?= "3688" +SRCREV_pn-libw100 ?= "47" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" +SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" -SRCREV_pn-linux-ixp4xx ?= "983" -SRCREV_pn-linux-openmoko ?= "4082" +SRCREV_pn-linux-ixp4xx ?= "1039" +SRCREV_pn-linux-openmoko ?= "4102" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" @@ -55,8 +63,11 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" +SRCREV_pn-mplayer ?= "24587" SRCREV_pn-multitap-pad ?= "337" SRCREV_pn-neod ?= "3421" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" SRCREV_pn-osb-jscore ?= "117" @@ -120,23 +131,24 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" +SRCREV_pn-opkg ?= "4022" +SRCREV_pn-opkg-native ?= "4019" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" SRCREV_pn-python-formencode = "3148" -SRCREV_pn-python-fso-pyproto = "49" +SRCREV_pn-python-fso-pyproto = "70" SRCREV_pn-python-gsmd = "127" +SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" +SRCREV_pn-u-boot-openmoko ?= "4100" +SRCREV_pn-usbpath ?= "3108" +SRCREV_pn-usbpath-native ?= "3108" 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" -SRCREV_pn-networkmanager ?= "2887" -SRCREV_pn-networkmanager-applet ?= "200" -SRCREV_pn-libw100 ?= "47" -SRCREV_pn-usbpath ?= "3108" -SRCREV_pn-usbpath-native ?= "3108" + diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ea4980b55a..c13c9b6c75 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -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/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 19379862ae..3a7c7ee549 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -3,7 +3,6 @@ #@DESCRIPTION: Distribution file for JLime (Linux for HP jornada 5xx,6xx,7xx,8xx series) #@MAINTAINER: Kristoffer Ericson <Kristoffer@jlime.com> -DISTRO = "Jornada Linux Mobility Edition" DISTRO_NAME = "JLime" DISTRO_VERSION = "Shrek" DISTRO_TYPE = "release" 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/mamona.conf b/conf/distro/mamona.conf index 26bf8b94f1..bf055874e8 100644 --- a/conf/distro/mamona.conf +++ b/conf/distro/mamona.conf @@ -3,7 +3,6 @@ #@NAME: Mamona #@-------------------------------------------------------------------- -DISTRO = "mamona" DISTRO_NAME = Mamona"" DISTRO_VERSION = "test-${DATE}" DISTRO_TYPE = "debug" diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index d68a03fa2b..f8ea1ee5af 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -8,7 +8,6 @@ # MokoSlug is based on Angstrom, and would hopefully just be done by features one day ... require conf/distro/angstrom-2008.1.conf -DISTRO = "mokoslug" DISTRO_NAME = "MokoSlug" DISTRO_VERSION = "1.0-alpha" DISTRO_REVISION = "1" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 334c8bba9b..0623ce6dd0 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -11,6 +11,8 @@ # # Bruno Randolf <bruno.randolf@4g-systems.biz> +TARGET_OS = "linux" + INHERIT += "package_ipk debian nylon-mirrors" INHERIT += "linux-kernel-base" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index d7b3cf753a..470dbf0de2 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -10,17 +10,16 @@ require conf/distro/include/angstrom-2007-for-openmoko.inc # # Header # -DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" -OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" +OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" -PREMIRRORS = "(ftp|https?)$://.*/.*/ http://downloads.openmoko.org/sources/" +PREMIRRORS = "(ftp|https?)$://.*/.* http://downloads.openmoko.org/sources/" FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf index 92e5ac5b39..0646b17f90 100644 --- a/conf/distro/openwrt-sdk.conf +++ b/conf/distro/openwrt-sdk.conf @@ -20,10 +20,14 @@ require conf/distro/generic-uclibc.conf DISTRO_NAME = "OpenWRT" DISTRO_REVISION = "2" +# Build ipk's wrapped with tar.gz instead of ar, like OpenWRT has them IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0" # This is what lives in SDK ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" +# Rename packages to names used in OpenWRT +PKG_ncurses = "libncurses" + # 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/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index 92fd42f4f8..0e130a2fd7 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -37,7 +37,8 @@ PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-binutils = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native" PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native" -PREFERRED_PROVIDER_virtual/linux-libc-headers = "sharprom-toolchain-native" +PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native" PREFERRED_VERSION_glibc = "2.2.5" @@ -52,6 +53,7 @@ PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie" QTE_VERSION = "2.3.10" OPIE_VERSION = "1.2.2" PALMTOP_USE_MULTITHREADED_QT = "no" +export palmtopdir = "/opt/QtPalmtop" require conf/distro/include/preferred-opie-versions.inc # 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/local.conf.sample b/conf/local.conf.sample index 0fa2b7d122..213ed12fae 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 += "gcc3-native" + +# Uncomment this if you are building Linux 2.4 Embedix kernels. # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget # to rename the binaries as instructed in the Wiki. -# 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" @@ -77,7 +84,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # openzaurus-unstable is a so called "versioned" distro, i.e. they # explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing -# DISTRO = "angstrom-2007.1" +# DISTRO = "angstrom-2008.1" # So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 2231f80ed2..add4c7e2d9 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -11,13 +11,17 @@ 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" # used by some images +IMAGE_FSTYPES ?= "jffs2" 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/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index 07616915aa..ba0c9f9a70 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index b6ccd7ef0d..3b9d5188f6 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index bf45d25c43..95c7626a63 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -15,7 +15,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" - +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf index 4df1030570..559bd40c75 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,10 @@ 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" + +UBOOT_ENTRYPOINT = "0x90000000" +UBOOT_LOADADRESS = "0x10000000" + + diff --git a/conf/machine/bd-neon.conf b/conf/machine/bd-neon.conf index 532193a567..f875d437c7 100644 --- a/conf/machine/bd-neon.conf +++ b/conf/machine/bd-neon.conf @@ -41,6 +41,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-module-nls-cp437 \ kernel-module-af-key \ kernel-module-i2c-pxa" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x40000 --pad=32243712; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 04e0e83051..5170f8993e 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -3,10 +3,10 @@ #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices TARGET_ARCH = "arm" -TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110" MACHINE_KERNEL_VERSION ?= "2.6" require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc +require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/conf/machine/davinci-sffsdr.conf b/conf/machine/davinci-sffsdr.conf index ecff6fae13..faf86c5ed0 100644 --- a/conf/machine/davinci-sffsdr.conf +++ b/conf/machine/davinci-sffsdr.conf @@ -19,7 +19,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" #ROOT_FLASH_SIZE = "29" -MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" +MACHINE_FEATURES = "kernel26 serial" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index ad0c64bef2..bfaf5ed793 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -36,6 +36,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index bd9621413a..2c2034b1b6 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -26,7 +26,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01kbd \ kernel-module-s3cmci \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ - kernel-module-snd-soc-smdk2440 \ " SERIAL_CONSOLE = "115200 ttySAC2" diff --git a/conf/machine/gesbc-9302.conf b/conf/machine/gesbc-9302.conf index ce45606dbd..ac4c1ef4b6 100644 --- a/conf/machine/gesbc-9302.conf +++ b/conf/machine/gesbc-9302.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux ?= "2.6.23+2.6.24-rc5" +PREFERRED_VERSION_linux ?= "2.6.24" #don't try to access tty1 USE_VT = "0" @@ -19,6 +19,7 @@ SERIAL_CONSOLE = "57600 ttyAM0" # used by some images ROOT_FLASH_SIZE = "8" #extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " #tune for ep93xx cpus diff --git a/conf/machine/gumstix-custom-connex.conf b/conf/machine/gumstix-custom-connex.conf new file mode 100644 index 0000000000..1b854582f8 --- /dev/null +++ b/conf/machine/gumstix-custom-connex.conf @@ -0,0 +1,75 @@ +# +# Use this file as a starting point for your custom gumstix configuration +# Edit it to reflect your hardware setup and then save it a parallel location in user.collection + +MACHINE_FEATURES += "connex" +require conf/machine/include/gumstix.inc +require conf/machine/include/tune-xscale.inc + +# +# Your flash size = Total flash (in MB) - 1 (for linux kernel partition) +#ROOT_FLASH_SIZE = "3" +ROOT_FLASH_SIZE = "15" + +# +# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1" +USE_VT = "0" +#USE_VT = "1" +#SYSVINIT_ENABLED_GETTYS = "1" + +# +# Uncomment features that your board set supports + +#MACHINE_FEATURES += "usbhost" +MACHINE_FEATURES += "usbgadget" + +MACHINE_FEATURES += "i2c" +#MACHINE_FEATURES += "spi" + +MACHINE_FEATURES += "serial" +MACHINE_FEATURES += "bluetooth" +MACHINE_FEATURES += "sound" + +# if you enable robostix you will need to disable both "lcd" and "touchscreen" features +#MACHINE_FEATURES += "robostix" + +#MACHINE_FEATURES += "lcd" +#MACHINE_FEATURES += "touchscreen" +#MACHINE_FEATURES += "keyboard" + +MACHINE_FEATURES += "pcmcia" +#MACHINE_FEATURES += "mmc" + +MACHINE_FEATURES += "wifi" +MACHINE_FEATURES += "ethernet" + +MACHINE_FEATURES += "fat" +#MACHINE_FEATURES += "ext2" + +# +# note: selection of MACHINE_FEATURES above will automatically include necessary kernel modules +# for those features via task-base-gumstix. Include below any extra kernel modules that you want installed + +#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx" + +# +# Uncomment or add kernel modules that should be autoloaded + +module_autoload_proc_gpio = 'proc_gpio' + +module_autoload_pcmcia = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pcmcia', '',d)} +module_autoload_pxa2xx_cs = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pxa2xx_cs', '',d)} + +module_autoload_pxamci = ${@base_contains('MACHINE_FEATURES', 'mmc', 'pxamci', '',d)} +module_autoload_mmc_block = ${@base_contains('MACHINE_FEATURES', 'mmc', 'mmc_block', '',d)} + +module_autoload_ethernet = ${@base_contains('MACHINE_FEATURES', 'ethernet', 'ethernet', '',d)} + +module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'gumstix_gadget', '',d)} +#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)} +module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)} +#module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)} + +module_autoload_ucb1400-ts = ${@base_contains('MACHINE_FEATURES', 'touchscreen','ucb1400-ts', '',d)} +module_autoload_evdev = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)} + diff --git a/conf/machine/gumstix-custom-verdex.conf b/conf/machine/gumstix-custom-verdex.conf new file mode 100644 index 0000000000..f2488d66e1 --- /dev/null +++ b/conf/machine/gumstix-custom-verdex.conf @@ -0,0 +1,78 @@ +# +# Use this file as a starting point for your custom gumstix configuration +# Edit it to reflect your hardware setup and then save it a parallel location in user.collection + +MACHINE_FEATURES += "verdex" +MACHINE_FEATURES += "iwmmxt" +require conf/machine/include/gumstix.inc +require conf/machine/include/tune-xscale.inc + +# +# Your flash size = Total flash (in MB) - 1 (for linux kernel partition) +ROOT_FLASH_SIZE = "15" +#ROOT_FLASH_SIZE = "31" + +# +# Enable use of virtual terminal for LCD on tty1 if USE_VT = "1" +#USE_VT = "0" +USE_VT = "1" +SYSVINIT_ENABLED_GETTYS = "1" + +# +# Uncomment features that your board set supports + +MACHINE_FEATURES += "usbhost" +#MACHINE_FEATURES += "usbgadget" + +MACHINE_FEATURES += "i2c" +#MACHINE_FEATURES += "spi" + +MACHINE_FEATURES += "serial" +MACHINE_FEATURES += "bluetooth" +MACHINE_FEATURES += "sound" + +# if you enable robostix you will need to disable both "lcd" and "touchscreen" features +#MACHINE_FEATURES += "robostix" + +MACHINE_FEATURES += "lcd" +MACHINE_FEATURES += "touchscreen" +MACHINE_FEATURES += "keyboard" + +MACHINE_FEATURES += "pcmcia" +MACHINE_FEATURES += "mmc" + +MACHINE_FEATURES += "wifi" +MACHINE_FEATURES += "ethernet" + +MACHINE_FEATURES += "ext2" +MACHINE_FEATURES += "fat" + +# +# note: selection of MACHINE_FEATURES above will automatically include necessary kernel modules +# for those features via task-base-gumstix. Include below any extra kernel modules that you want installed + +#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "kernel-module-xxxxxxx" + +# +# Uncomment or add kernel modules that should be autoloaded + +module_autoload_proc_gpio = 'proc_gpio' + +module_autoload_pcmcia = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pcmcia', '',d)} +module_autoload_pxa2xx_cs = ${@base_contains('MACHINE_FEATURES', 'pcmcia', 'pxa2xx_cs', '',d)} + +module_autoload_pxamci = ${@base_contains('MACHINE_FEATURES', 'mmc', 'pxamci', '',d)} +module_autoload_mmc_block = ${@base_contains('MACHINE_FEATURES', 'mmc', 'mmc_block', '',d)} + +module_autoload_ethernet = ${@base_contains('MACHINE_FEATURES', 'ethernet', 'ethernet', '',d)} + +module_autoload_ohci-hcd = ${@base_contains('MACHINE_FEATURES', 'usbhost', 'ohci-hcd', '',d)} + +module_autoload_gumstix_gadget = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'gumstix_gadget', '',d)} +#module_autoload_g_file_storage = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_file_storage', '',d)} +module_autoload_g_ether = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_ether', '',d)} +#module_autoload_g_serial = ${@base_contains('MACHINE_FEATURES', 'usbgadget', 'g_serial', '',d)} + +module_autoload_tsc2003 = ${@base_contains('MACHINE_FEATURES', 'touchscreen','tsc2003', '',d)} +module_autoload_evdev = ${@base_contains('MACHINE_FEATURES', 'touchscreen','evdev', '',d)} + diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 6f0e37b803..c037226154 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 " -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc # h3700, h3800 have 32, but let that be the bonus ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 5db7abd3d4..8b9b7ee365 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -24,6 +24,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" + # # Modules autoload and other boot properties # diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index c4c1237bae..a55b75cd89 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -24,10 +24,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" +# Ship complete set of modules ('kernel-modules') for easier debug purposes MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules \ + kernel-module-h5400-lcd \ kernel-module-h5400-battery \ - kernel-module-snd-soc-h5000" + kernel-module-h5400-bt \ + kernel-module-snd-soc-h5000 \ + kernel-module-i2c-pxa \ + at76c503a-modules" # # Modules autoload and other boot properties diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf index 515700d9e6..34255a1536 100644 --- a/conf/machine/htcwallaby.conf +++ b/conf/machine/htcwallaby.conf @@ -8,7 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 " -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" VOLATILE_STORAGE_SIZE = "32" diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index fc5fd4e136..1bc0b2e000 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -2,47 +2,43 @@ #@Name: Gumstix pxa2xx boards #@DESCRIPTION: Gumstix pxa2xx boards +# Don't edit this file unless you *really* know what you are doing! + TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te " -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel = "gumstix-kernel" KERNEL_IMAGETYPE = "uImage" - -module_autoload_pxamci = "pxamci" -module_autoload_mmc_block = "mmc_block" -module_autoload_gumstix_gadget = "gumstix_gadget" -module_autoload_g_ether = "g_ether" -module_autoload_smc91x = "smc91x" -module_autoload_smc911x = "smc911x" +RDEPENDS_kernel-base = "" +KERNEL_IMAGE_MAXSIZE = "1048577" UBOOT_ENTRYPOINT = "a0008000" -#Assume people have some gumstix extension boards -MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth" - -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" +MACHINE_FEATURES += "kernel26 " +COMBINED_FEATURES ?= "" -# Install all kernel modules -#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules" +IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash-uids" -# Install only selected kernel modules, comment out line above also -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \ - kernel-module-rtc-core \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sa1100 \ - kernel-module-rtc-sysfs \ - kernel-module-smc91x \ - kernel-module-gumstix-smc91x \ - kernel-module-smc911x \ - kernel-module-gumstix-smc911x \ - " - -# used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0 vt100" -#don't try to access tty1 -USE_VT = "0" - -require conf/machine/include/tune-xscale.inc +MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " \ + " + +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \ + " +# +# The following *should* be in a distro.conf file +# We include them here to avoid creating a new distro + +PREFERRED_VERSION_gumstix-kernel = "2.6.21" +PREFERRED_VERSION_udev = "115" +PREFERRED_VERSION_gnuplot = "4.0.0" +PREFERRED_VERSION_dropbear = "0.47" +PREFERRED_VERSION_wpa-supplicant = "0.5.8" +PREFERRED_VERSION_bluez-utils = "3.24" +PREFERRED_VERSION_bluez-utils-alsa = "3.24" +PREFERRED_VERSION_bluez-libs = "3.24" +PREFERRED_VERSION_bluez-gstreamer-plugin = "3.24" +PREFERRED_VERSION_bluez-hcidump = "1.40" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index 924fb54f1e..da1e8b7557 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -7,7 +7,7 @@ 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.23.14+svnr${SRCREV}" +PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+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 da88b1494f..a9945acd34 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -22,6 +22,7 @@ MACHINE_DISPLAY_PPI = "180" ROOT_FLASH_SIZE = "24" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc new file mode 100644 index 0000000000..448b28c91f --- /dev/null +++ b/conf/machine/include/tune-strongarm.inc @@ -0,0 +1,6 @@ +# 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/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc deleted file mode 100644 index f136710409..0000000000 --- a/conf/machine/include/tune-strongarm1100.inc +++ /dev/null @@ -1,5 +0,0 @@ -# This machine lists common configuration options for Strongarm 1100 devices -# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type - -TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100" - diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 2037931803..9a4d373de0 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -31,7 +31,9 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" 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_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" +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" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index a42dd8c127..72fff1ed5e 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index ee9117e406..8741eb4ff6 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf index 81c3e29e91..31f13b00b6 100644 --- a/conf/machine/mpc8313e-rdb.conf +++ b/conf/machine/mpc8313e-rdb.conf @@ -5,13 +5,17 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c3" -PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_u-boot = "git" +PREFERRED_PROVIDER_virtual/kernel ?= "linux" +PREFERRED_VERSION_u-boot ?= "git" MACHINE_FEATURES = "kernel26 usbhost ext2" -PREFERRED_VERSION_u-boot = "1.3.0" +KERNEL_IMAGETYPE = "uImage" + +PREFERRED_VERSION_u-boot = "1.3.1" UBOOT_MACHINE = "MPC8313ERDB_33_config" +UBOOT_ENTRYPOINT = "0" +UBOOT_LOADADDRESS = "0" #rootfs on NAND flash EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x4000 --no-cleanmarkers" diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf index ee2c6144a9..db1a7ccf16 100644 --- a/conf/machine/mpc8323e-rdb.conf +++ b/conf/machine/mpc8323e-rdb.conf @@ -6,10 +6,12 @@ TARGET_ARCH = "powerpc" TARGET_FPU ?= "soft" PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppce300c2" -PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/kernel ?= "linux" MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" +KERNEL_IMAGETYPE = "uImage" + PREFERRED_VERSION_u-boot = "1.1.6" UBOOT_MACHINE = "MPC8323ERDB_config" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 3ee97a447e..f95e403367 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -1,12 +1,12 @@ #@TYPE: Machine -#@NAME: X86 -#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines +#@NAME: Netvista J320 Internet Applicance +#@DESCRIPTION: Machine configuration for a Linux IBM 8365 / J320 PC-based internet terminals -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i486" -# TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "netvista" -PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.23" + XSERVER = "xserver-kdrive-vesa" KERNEL_IMAGETYPE = "bzImage" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 4e36c6d38a..15126d56a9 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-xomap" PREFERRED_PROVIDER_virtual/bootloader = "" PREFERRED_PROVIDER_tslib = "tslib-maemo" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 3dc19a4a31..ffec67b699 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 3dc19a4a31..ffec67b699 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 9a97150981..98e3a7d3e5 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -12,6 +12,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 82be4e3f79..343b0091b5 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" PREFERRED_VERSION_u-boot = "1.1.4" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" MACHINE_FEATURES = "kernel26" diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf index 39e6896b3b..0e6b646897 100644 --- a/conf/machine/omap2430sdp.conf +++ b/conf/machine/omap2430sdp.conf @@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" PREFERRED_VERSION_u-boot = "1.1.4" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" MACHINE_FEATURES = "kernel26" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index abd50b116a..7a7b5c1a60 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -11,6 +11,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" # PREFERRED_VERSION_u-boot = "1.1.6" SERIAL_CONSOLE ?= "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" ROOT_FLASH_SIZE = "29" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 0fbd9d1578..4e8f011a1e 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/tune-xscale.inc IMAGE_FSTYPES ?= "jffs2" 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/shark.conf b/conf/machine/shark.conf index 87c260856d..3b9165d2b8 100644 --- a/conf/machine/shark.conf +++ b/conf/machine/shark.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-z" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" EXTRA_IMAGEDEPENDS = "" SERIAL_CONSOLE = "ttySA0 115200 vt100" @@ -15,7 +16,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100" ROOT_FLASH_SIZE = "16" USE_VT = "0" -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2" MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay " diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index e187ee1e75..6334d34171 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat" include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc -require conf/machine/include/tune-strongarm1100.inc +require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index d8ea4b8890..914300e31c 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/tune-xscale.inc IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 2dbe3ea863..0275f6b2f5 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -8,6 +8,7 @@ PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n" EXTRA_IMAGEDEPENDS = "" SERIAL_CONSOLE = "38400 ttyS0" diff --git a/conf/machine/xxs1500.conf b/conf/machine/xxs1500.conf index 9cc47cdef7..4d5909126a 100644 --- a/conf/machine/xxs1500.conf +++ b/conf/machine/xxs1500.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "mipsel" PREFERRED_PROVIDER_virtual/kernel = "linux-xxs1500" +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--pad=0xa00000 --little-endian --eraseblock=0x20000 -n" # does not gain any speed and just creates problems: diff --git a/conf/sanity.conf b/conf/sanity.conf index fe1e2282e4..4af4454e2e 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,16 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.8.8" +BB_MIN_VERSION = "1.8.10" + +# +# SANITY_ABI allows us to notify users when the format of TMPDIR changes in +# an incompatible way. Such changes should usually be detailed in the commit +# that breaks the format and have been previously discussed on the mailing list +# with general agreement from the core team. +# +SANITY_ABI = "0" +SANITY_ABIFILE = "${TMPDIR}/abi_version" + INHERIT += "sanity" |