diff options
83 files changed, 1410 insertions, 94 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae0519b2ca..83b2835c23 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,10 +180,13 @@ Interests: Small read-only Linux based firmware, deterministic builds. Recipes: lighttpd, fastcgi, squashfs-tools, rt-tests, linux-rt, linux Machines: mpc8313e-rdb, mpc8315e-rdb, canyonlands, calamari, openrd-base -Person: Liam Girdwoord -Mail: liam.girdwood@wolfsonmicro.com +Person: Liam Girdwood +Mail: lrg@slimlogic.co.uk +Website: http://www.slimlogic.co.uk +Interests: Mobile and embedded Linux within commercial environments. +Interests: Kernel development, userspace development, audio, power management. Machines: mx31ads -Recipes: mx31ads-kernel* +Recipes: mx31ads-kernel*, glibc-2.10.1, some pulseaudio versions Person: Lynn Lin Mail: Lin_Lynn@emc.com diff --git a/classes/package_dbg.bbclass b/classes/package_dbg.bbclass new file mode 100644 index 0000000000..39dceaf9b3 --- /dev/null +++ b/classes/package_dbg.bbclass @@ -0,0 +1,125 @@ +# package_dbg.bbclass: populate -dbg versions for each package in PACKAGES +# +# Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. +# +# Released under the MIT license (see LICENSE.MIT for the terms) + + +inherit package + + +PACKAGE_DBG_DIRS = "${bindir} ${sbindir} \ + ${libexecdir} ${libdir} \ + ${base_bindir} ${base_sbindir} \ + ${base_libdir}" +PACKAGE_DBG_DESC = "Debugging files for %s" +PACKAGE_DBG_EXCLUDE = "${PN}-locale* ${PN}-doc ${PN}-dev *-dbg" + + +def __find(dir): + """ Given a directory, recurses into that directory, + returning all files. """ + + from os import walk + from os.path import join + + for root, dirs, files in walk(dir): + for file in files: + yield join(root, file) + +def __package_get_files(pkg, d): + """ Obtains a list of files to be included in a package. + + Starting from the FILES_<pkg> variable, it expands any globs in the list, + which removes missing files, and traverses any directories in the list. + + It does *not* remove files which are also in other packages, it's left + to the user's discretion whether to allow overlap. """ + + from glob import glob + from os.path import join, isdir, islink + + installdir = d.getVar("D", True) + installdirlen = len(installdir) + + files = (d.getVar("FILES_%s" % pkg, True) or "").split() + for globbed in (glob(join(installdir, file[1:])) for file in files): + for path in globbed: + if isdir(path) and not islink(path): + for file in __find(path): + yield file[installdirlen:] + else: + yield path[installdirlen:] + +def add_dbg_packages(d): + from fnmatch import fnmatch + + packages = d.getVar("PACKAGES", True).split() + excludes = d.getVar("PACKAGE_DBG_EXCLUDE", True).split() + + for pkg in tuple(packages): + if any(fnmatch(pkg, excluded) for excluded in excludes): + continue + + dbgpkg = "%s-dbg" % pkg + if not dbgpkg in packages: + packages.insert(0, dbgpkg) + + d.setVar("PACKAGES", " ".join(packages)) + + +# Add the -dbg packages to PACKAGES +python () { + from bb.data import inherits_class as inherits + + # Task handles its own -dbg versions of its packages at the moment + if not inherits("task", d): + dynpkgs = d.getVar("PACKAGES_DYNAMIC", True).split() + dynpkgs += ["%s-dbg" % dyn for dyn in dynpkgs] + d.setVar("PACKAGES_DYNAMIC", " ".join(dynpkgs)) + + add_dbg_packages(d) +} + +python populate_packages_prepend () { + from bb.data import inherits_class as inherits + + if not inherits("task", d): + bb.build.exec_func("package_do_dbg", d) +} + +# Populate the -dbg subpackage metadata +python package_do_dbg() { + """ Populate the -dbg subpackage metadata. """ + + from os.path import join, basename, dirname + + def setVar(key, val): + if d.getVar(key, val) is None: + d.setVar(key, val) + + add_dbg_packages(d) + packages = d.getVar("PACKAGES", True).split() + desc = d.getVar("PACKAGE_DBG_DESC", True) + debug_dirs = d.getVar("PACKAGE_DBG_DIRS", True).split() + + done = [] + for pkgname in tuple(packages): + files = tuple(__package_get_files(pkgname, d)) + dbg = [join(dirname(file), ".debug", basename(file)) + for file in files + if not file in done and + any(file.startswith(dir) for dir in debug_dirs)] + done.extend(files) + + if dbg: + setVar("FILES_%s-dbg" % pkgname, " ".join(dbg)) + setVar("DESCRIPTION_%s-dbg" % pkgname, desc % pkgname) + setVar("RDEPENDS_%s-dbg" % pkgname, pkgname) + else: + try: + packages.remove("%s-dbg" % pkgname) + except ValueError: + pass + d.setVar("PACKAGES", " ".join(packages)) +} diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass index 35958b34ab..d3d4a14e8a 100644 --- a/classes/qt3e.bbclass +++ b/classes/qt3e.bbclass @@ -6,6 +6,6 @@ export QTEDIR="${STAGING_DIR_HOST}/qte3" export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3" export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3" export OE_QMAKE_CXXFLAGS="${CXXFLAGS} " -export OE_QMAKE_INCDIR_QT="${QTEDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTEDIR}/lib" +export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include" +export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib" export OE_QMAKE_LIBS_QT="qte" diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index f65df61c1d..f57d8e47d0 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -96,11 +96,14 @@ def check_sanity(e): if not check_app_exists("qemu-arm", e.data): messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" - if os.path.exists("/proc/sys/vm/mmap_min_addr"): - f = file("/proc/sys/vm/mmap_min_addr", "r") - if (f.read().strip() != "0"): - messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n" - f.close() + try: + if os.path.exists("/proc/sys/vm/mmap_min_addr"): + f = file("/proc/sys/vm/mmap_min_addr", "r") + if (f.read().strip() != "0"): + messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n" + f.close() + except: + pass for util in required_utilities.split(): if not check_app_exists( util, e.data ): diff --git a/conf/amend-recipes.inc b/conf/amend-recipes.inc new file mode 100644 index 0000000000..bcb93d4e75 --- /dev/null +++ b/conf/amend-recipes.inc @@ -0,0 +1,29 @@ +# Allows tweaks to be amended to a recipe via a .inc in its FILESPATH +# +# Simply drop amend.inc into an appropriate place in a recipe's FILESPATH and +# it'll be parsed in after the recipe itself is. +# +# Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. +# +# Released under the MIT license (see LICENSE.MIT for the terms) + +python () { + import bb, os + + filespath = d.getVar("FILESPATH", 1).split(":") + amendfiles = [os.path.join(fpath, "amend.inc") + for fpath in filespath] + + # Adding all amend.incs that can exist to the __depends, to ensure that + # creating one of them invalidates the bitbake cache. Note that it + # requires a fix in bitbake. Without the bitbake fix, the cache will be + # completely invalidated on every bitbake execution. + depends = d.getVar("__depends", 0) or [] + d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)]) + + existing = (file for file in amendfiles if os.path.exists(file)) + try: + bb.parse.handle(existing.next(), d, 1) + except StopIteration: + pass +} diff --git a/conf/checksums.ini b/conf/checksums.ini index d78264d553..ea05753c73 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1362,6 +1362,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7 md5=0fc5008858661c0abd0399acbe30ef28 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037 +[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2] +md5=218373aa45d74b6ba8c69c4d5af3bb19 +sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d + [http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2] md5=218373aa45d74b6ba8c69c4d5af3bb19 sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d @@ -5814,6 +5818,10 @@ sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4 md5=5cb7987d29db068153bdc8f23c767c43 sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d +[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2] +md5=3ca8ddb42cd4ee31b8690031303221af +sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1 + [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz] md5=8e11d77770452f97bb3c23f510489815 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d @@ -9314,6 +9322,10 @@ sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f md5=c9f8cebfba72bfab674bc0170551fb8d sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf +[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2] +md5=78e7c4dc7dcb74b1869fee7897e00f59 +sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451 + [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2] md5=3dfbd17203c0c88b94b6f579f24c11cc sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c @@ -9654,6 +9666,14 @@ sha256=7acda11db2eb07b2f68a1a506203fe95141954acb10c394850418fd04ed80a07 md5=07fa253d8506c22640d74eb4fc90a092 sha256=1b3234f1feac6a619a9a61a0b5f67ab8cd89d94aeeec9a5cc2d78b81d9d8cab4 +[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2] +md5=97ea6823e88b39284187764c1ca95a59 +sha256=d2d686fb2528ee045bbcd9f18d0d452e0eb88c2265a1947f639152b61a5987f6 + +[http://ftp.gnome.org/pub/GNOME/sources/gnome-keyring/2.29/gnome-keyring-2.29.5.tar.bz2] +md5=13c0da5743242313400fe86a363a5f69 +sha256=cf63c162845929a1b1f407a334afdafdc2bc3769001d51d214bc22284a9fba9f + [http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.26/gnome-media-2.26.0.tar.bz2] md5=3d519bc7d812aed8f6e4288b6d3cdf26 sha256=39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7 @@ -13922,6 +13942,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051 md5=001d780829f936e34851ef7cd37b4dfd sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2 +[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2] +md5=5d74971360f194ce33d2bd2e4d9b066c +sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac + [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2] md5=0545089013213e90aac19b8f8045d32e sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac @@ -14646,6 +14670,10 @@ sha256=5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4 md5=8868b6083392964a6969547ceb8d7cd1 sha256=42b2ac58b86b2cc93fbbc65f94a3d1fcf5e8f33f728384653b30dbe456e91274 +[http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2] +md5=5c7c5ea9c2f78a3c1e9ff2f1e27ad751 +sha256=95c0230a31a657e1873fc601318bbaa16722986699219317053f1cd1aa2a28bf + [http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.6/libbonobo-2.6.0.tar.bz2] md5=078942cb9c6a1a31f93958e993353f45 sha256=cd579e8dff38882d685be01449db92dad7c78900885d5a9abf6160756f83a7a8 @@ -14910,6 +14938,10 @@ sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c md5=e0e66fae165d0b665b61e9516bf33ade sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c +[http://dri.freedesktop.org/libdrm/libdrm-2.4.17.tar.bz2] +md5=667d81f993f7fd8a1b1b1b830a28a748 +sha256=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a + [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz] md5=47612d2f8a4d4dee746a166d8b7f6f77 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a @@ -15190,6 +15222,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844 md5=06b14f1cd96432b0717ed03fe013ca4d sha256=55c616b0761faaa9fb028434de97b02d5145dfc52b1db632671ebc6cc6905575 +[http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.5/libgdata-0.5.1.tar.bz2] +md5=fc9be11d2f823bb16d6e03e2a0dda85d +sha256=2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0 + [http://geda.seul.org/release/v1.4/1.4.1/libgeda-1.4.1.tar.gz] md5=16f2e3176eb489838bad57c8728c7388 sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d @@ -17734,6 +17770,10 @@ sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5 md5=5d86ca7bb4ed458743acd922ff09dae6 sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade +[http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz] +md5=651e9c518db317d11ae5b9076fb0e3ee +sha256=f9c0327a9fa379f2db6bf4b599bd1e37b65e7224aa3fd2bd860a5e0dc5b06040 + [http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2] md5=de958cdb8d00e74792dd69f3c945b037 sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057 @@ -22022,6 +22062,10 @@ sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22 md5=02bd3669f53c404c19980d5efb6f86fb sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185 +[http://cairographics.org/releases/pixman-0.17.4.tar.gz] +md5=734f70667d0a6454a1b1e332f8d50083 +sha256=dd2f4a7c9c9373d20720d78718c0e9603741a83d66da3316a020b097b1c918a9 + [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2] md5=c354ab5b0da10227226d3ef604254875 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa @@ -24222,6 +24266,10 @@ sha256=91619748c4dba733c60eb8a40805c972f407b2463dc6de856ac40336d66bc16c md5=5b60500bc9605d2409b71124e48aa929 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c +[http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-0.1 |