summaryrefslogtreecommitdiff
path: root/meta/recipes-core/glibc
AgeCommit message (Collapse)AuthorFiles
2016-11-08glibc: fix CVE-2016-1234, CVE-2016-3075, CVE-2016-5417Pascal Bach4
Only relevant for krogoth since version 2.24+ (master, morty) is not affected. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
2016-08-23glibc: use the host locale archive in nativesdk buildsRoss Burton1
The nativesdk libc when used by buildtools has a hard requirement on supporting a UTF-8 locale because Python 3 needs a UTF-8 locale. However we currently only ship the C locale, which means that Python attempts to lookup the user's locale (for example, en_NZ.UTF-8) in the locale archive under it's prefix it fails and falls back to C. This the results in Python using ASCII instead of UTF-8 for file encoding, and bitbake breaks. Th obvious solution would be to ship all locales, but this would add approximately 250MB to the size of the buildtools tarball (which is currently around 30MB). Generating a binary locale archive reduces this down to 100MB, but this is still a drastic increase in footprint. If we ship a subset of locales in the tarball then there will be users whose locale isn't in the tarball, and they'll have to change their locale to an "approved" one, which isn't the best of messages to send to new users. The alternative is to tell the nativesdk libc that the locale archive isn't under it own prefix but is in fact at /usr/lib/locale/locale-archive, so the buildtools libc uses the host locale archive. The locale archive format appears to be at least fairly stable: our glibc 2.24 can read the locale archive generated by glibc 2.17 (Centos 7). [ YOCTO #9775 ] Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-07-27glibc: Security fix for CVE-2016-4429Armin Kuster2
Master will a have fix after pending update Signed-off-by: Armin Kuster <akuster@mvista.com>
2016-07-27glibc: Security fix for CVE-2016-3706Armin Kuster2
Master not affected. Signed-off-by: Armin Kuster <akuster@mvista.com>
2016-06-29cross-localedef-native_2.22.bb: Use autotools configureTristan Van Berkom1
Use the autotools default configure commands and just tell autotools where to run configure from. This fixes the build when running on an aarch64 host, which the prebuilt configure scripts with glibc 2.22 do not recognize. (From OE-Core rev: 33d4c758a5d71435437dde74556d32404d91342f) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com>
2016-04-06glibc: remove unused CVE patchesRobert Yang5
They were CEVs and should be already in the source after upgraded. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-31ldconfig-native: Fix ELF flags on 64-bit binariesClemens Lang1
Yocto's ldconfig-native was exported from an old version of glibc and generates an ld.so.cache that is partially ignored by current versions of glibc when loading libraries. This occurs for 64-bit binaries, where glibc expects FLAG_ELF_LIBC6, but ldconfig-native only generates the standard ELF flag. Fix this with an additional patch on top of the patch for now. You can verify this by applying the patch below to your target copy of glibc and running LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --list $anybinary --- ./elf/dl-cache.c.orig 2016-01-07 11:05:36.823447171 +0100 +++ ./elf/dl-cache.c 2016-01-07 11:19:53.925878628 +0100 @@ -106,6 +106,8 @@ if (_dl_cache_check_flags (flags) \ && _dl_cache_verify_ptr (lib->value)) \ { \ + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS))\ + _dl_debug_printf (" considering file %s\n", cache_data + lib->value); \ if (best == NULL || flags == GLRO(dl_correct_cache_id)) \ { \ HWCAP_CHECK; \ @@ -117,6 +119,9 @@ searching. */ \ break; \ } \ + } else { \ + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) \ + _dl_debug_printf (" ignoring file %s due to flags %x, expected %x\n", cache_data + lib->value, lib->flags, GLRO(dl_correct_cache_id)); \ } \ } \ while (++middle <= right); \ @@ -265,14 +270,23 @@ /* Only accept hwcap if it's for the right platform. */ #define HWCAP_CHECK \ - if (lib->hwcap & hwcap_exclude) \ + if (lib->hwcap & hwcap_exclude) { \ + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) \ + _dl_debug_printf (" hwcap mismatch %x vs. %x\n", lib->hwcap, hwcap_exclude); \ continue; \ - if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \ + } \ + if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) { \ + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) \ + _dl_debug_printf (" os version mismatch %x vs. %x\n", lib->osversion, GLRO(dl_osversion)); \ continue; \ + } \ if (_DL_PLATFORMS_COUNT \ && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \ - && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \ - continue + && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) { \ + if (__glibc_unlikely (GLRO_dl_debug_mask & DL_DEBUG_LIBS)) \ + _dl_debug_printf (" platform mismatch %x vs. %x\n", lib->hwcap & _DL_HWCAP_PLATFORM, platform); \ + continue; \ + } SEARCH_CACHE (cache_new); } else This version of ldconfig-native should really be replaced with a version matching the glibc source in use on the target platform. Signed-off-by: Clemens Lang <clemens.lang@bmw-carit.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-07glibc: Add relocation of GCONV_PATHRichard Purdie1
We're seeing various failures where nativesdk glibc can't find the gconv modules. We've tried various workaround but this needs fixing 'properly'. One significant problem is knowing when a binary would use this glibc and hence when to set the path and when not to. Add the default path to its own special section which the sdk relocation script already knows how to handle and remap. This significantly improves the usability of uninative. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-28glibc.inc: improve optimisation level sanity checkingAndre McCurdy1
- Avoid code duplication to handle -O, -O1 and -Os cases - Consider the effective optimisation level only (avoids spurious warnings if multiple optimisation flags are present). - Prefix warnings with PN instead of hardcoding "glibc" (avoids confusing warnings since the test is also applied to glibc-initial, nativesdk-glibc, nativesdk-glibc-initial, etc, and each could potentually have different optimisation flags). Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-02-21glibc: Upgrade to 2.23Khem Raj45
Drop kconfig and options-group support Forward port cross-localedef support Assume ssp support in libc when building gcc-initial Signed-off-by: Khem Raj <raj.khem@gmail.com>
2016-02-18glibc: Security fix CVE-2015-7547Armin Kuster2
CVE-2015-7547: getaddrinfo() stack-based buffer overflow Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-18glibc: CVE-2015-8776Armin Kuster2
it was found that out-of-range time values passed to the strftime function may cause it to crash, leading to a denial of service, or potentially disclosure information. Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-18glibc: CVE-2015-9761Armin Kuster3
A stack overflow vulnerability was found in nan* functions that could cause applications which process long strings with the nan function to crash or, potentially, execute arbitrary code. Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-18glibc: CVE-2015-8779Armin Kuster2
A stack overflow vulnerability in the catopen function was found, causing applications which pass long strings to the catopen function to crash or, potentially execute arbitrary code. Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-18glibc: CVE-2015-8777.patchArmin Kuster2
The process_envvars function in elf/rtld.c in the GNU C Library (aka glibc or libc6) before 2.23 allows local users to bypass a pointer-guarding protection mechanism via a zero value of the LD_POINTER_GUARD environment variable. Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-07glibc-locale: fix QA warningArmin Kuster1
WARNING: QA Issue: glibc-locale: /glibc-binary-localedata-sd-in/usr/lib/locale/sd_IN/LC_CTYPE is owned by uid 1000, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] fix type Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-06cross-localedef-native: add ABI breaking glibc patchJens Rehsack1
Add patch from commit 96b1b5c127e9e0e637aaf7948cf3330a94a5cd57 to cross-localedef-native to avoid broken images built with ENABLE_BINARY_LOCALE_GENERATION set to 1: $ sh -c "export LANG=de_DE; ls -la" sh: loadlocale.c:130: _nl_intern_locale_data: Assertion `cnt < (sizeof (_nl_value_type_LC_COLLATE) / sizeof (_nl_value_type_LC_COLLATE[0]))' failed. Aborted Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-01-30glibc.inc: do not immediate expand SELECTED_OPTIMIZATIONHongxu Jia1
We need to expand SELECTED_OPTIMIZATION later, so do not immediate expansion, and do the work in anonymous python function. It is reasonable to give an error for -O0. [YOCTO #7058] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-29glibc-testing.inc: drop pruning of PATCH_GET from the testglibc scriptAndre McCurdy1
PATCH_GET is no longer exported by bitbake.conf, so no longer needs to be pruned from the glibc do_compile() environment. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-01-26meta: fix capitalisation in Upstream-StatusRoss Burton1
Signed-off-by: Ross Burton <ross.burton@intel.com>
2016-01-16glibc-initial.inc: use relative path to run configureRobert Yang1
Avoid potential build path in output files. [YOCTO #8894] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
2015-12-16meta: Drop now pointless manual -dbg packagingRichard Purdie2
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg isn't needed in most cases, we can remove them. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-14nopackages: Add class for recipes which don't generate packagesRichard Purdie1
It turns out writing the same list of packaging tasks multiple times in multiple places is error prone. Move this to a new class 'nopackages", migrate existing users and add glibc-initial and libgcc-initial since we don't want packages for those recipes. This means the sstate for those recipes won't be installed, saving small amounts of build time and bandwidth. A reference to the old package_write task is also dropped. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08package_regex.inc: split GITTAGREGEX entries into recipe filesAlexander Kanavin2
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-12-08glibc: fix libdir/libexecdir path confusionRoss Burton1
$libdir/glibc is deleted if it doesn't exist but this is incorrectly assuming what variables are used to create this directory. In fact libexecdir is being used in the Makefile so use that in the recipe too. This fixes builds where libexecdir is changed. Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-12-01glibc/0029-fix-getmnt-empty-lines.patch: fix getmntent()Peter Seebach2
When confronted with an empty line, getmntent() can underrun a buffer, possibly doing very strange things if it finds additional space/tab characters. Backport the upstream fix. Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-12-01glibc: Backported a patch to fix glibc's bug(18589)Li Xin2
Also Fix LSB NG cases: * /tset/ANSI.os/locale/setlocale/T.setlocale 1 2 4 5 15 * /tset/ANSI.os/string/strcoll_X/T.strcoll_X 1 * /tset/LI18NUX2K.L1/base/wcscoll/T.wcscoll 1 * /tset/LI18NUX2K.L1/utils/localedef/T.localedef 7 * /tset/LI18NUX2K.L1/utils/sort/T.sort 1 3 17 19 33 35 * /tset/LI18NUX2K.L1/utils/comm/T.comm 1 2 * /tset/LI18NUX2K.L1/utils/ls-fh/T.ls-fh 2 This patch is backported from https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6c84109cfa26f35c3dfed3acb97d347361bd5849 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-11-25glibc: fix Upstream-Status tagRoss Burton1
Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-11-16glibc: Fix ld.so / prelink interface for ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATAMark Hatle2
A bug in glibc 2.22's ld.so interface for the prelink support causes the displayed values to be incorrect. The included path fixes this issue. Clear ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA for prelink prelink runs ld.so with the environment variable LD_TRACE_PRELINKING set to dump the relocation type class from _dl_debug_bindings. prelink has the following relocation type classes: where ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA has a conflict with RTYPE_CLASS_TLS. Since prelink doesn't use ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA, we should clear the ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA bit when the DL_DEBUG_PRELINK bit is set. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2015-10-29glibc: Allow 64 bit atomics for x86Juro Bystricky2
The fix consist of allowing 64bit atomic ops for x86. This should be safe for i586 and newer CPUs. It also makes the synchronization more efficient. [YOCTO #8140] Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-28glibc/mmc-utils: Rename 'BRANCH' variable to 'SRCBRANCH' for clearnessOtavio Salvador2
The 'BRANCH' variable name has no explicit relation with the SRC_URI. Using 'SRCBRANCH' makes it more obvious and easier to identify. This patch makes the use consistent across the metadata. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-09-16glibc: Ensure OVERRIDES doesn't influence sstate checksumRichard Purdie1
Switching MACHINE was causing nativesdk-glibc to rebuild. This was from the use of OVERRIDES in one of the functions. Exclude OVERRIDES from the checksum to avoid this. [patch to oe-selftest to ensure this doesn't regress follows] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-16glibc: don't require bash for nscd init scriptRoss Burton2
The nscd init script uses #! /bin/bash but only really uses one bashism (translated strings), so remove them and switch the shell to #! /bin/sh. Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-09-12meta: Fix Upstream-Status statementsRoss Burton1
Fix a variety of problems such as typos, bad punctuations, or incorrect Upstream-Status values. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-12packagegroup-core-nfs: provide the nfs-client IMAGE_FEATURESRoy Li1
provide the nfs-client IMAGE_FEATURES, to ease a user to only install nfs client related files to image Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-09-01glibc: package nscd related filesRoy Li2
install nscd related configuration file, startup files, and package them, make nscd easy to startup Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-08-24glibc: use cross-rpcgen to replace host's rpcgenRobert Yang1
There might be unexpected errors when use host's rpcgen. [YOCTO #8181] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-08-19glibc-package: use ${PN} in INSANE_SKIPMartin Jansa1
* INSANE_SKIP_${PN}_append_aarch64 is causing following warning in some setups: WARNING: Variable key INSANE_SKIP_${PN} () replaces original key INSANE_SKIP_glibc (). * in worst case this will be applied also for glibc-initial package which is using the same glibc-package.inc, but glibc-initial doesn't create any packages so we should be fine * someone building for aarch64 should confirm verify that this INSANE_SKIP is still needed and cannot be fixed properly it was introduced in: commit aeb6f53dd607ceb0d2265a05c27f751109c73752 Author: Mark Hatle <mark.hatle@windriver.com> Date: Thu Dec 18 16:51:13 2014 +0800 glibc-package: aarch64 enable symlink for ABI compliance aarch64 requires the ld.so to be present in /lib, even if the rest of the libraries are installed into an alternative directory. See: https://sourceware.org/glibc/wiki/ABIList Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-08-19glibc: Consider adding -Wno-error in cases when not using -O2Khem Raj1
glibc has recently turned on Werror globally which is good but then not all option combos are well tested so there still remains cleanup needed when not using -O2, so lets just disable Werror in such cases, until fixed upstream Change-Id: I2d491c360a15b0752c97ff77ee0faaeede6e8d2a Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-08-16glibc: Package libmvec when builtKhem Raj1
libmvec is new library in glibc 2.22 and currently turned on by default on x86_64. this helps in packaging it properly when its generated Fixes warning like WARNING: QA Issue: nativesdk-glibc: Files/directories were installed but not shipped in any package: /usr/local/oecore-x86_64/sysroots/x86_64-angstromsdk-linux/lib/libmvec-2.21.90.so Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. [installed-vs-shipped] Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-08-16glibc: Upgrade 2.21 -> 2.22Khem Raj47
- git'ify the OE patches - add_resource_h_to_wait_h.patch - dropped, we do not support that old perf anymore - mips-rld-map-check.patch - Dropped because binutils is fixed for it see https://sourceware.org/ml/binutils/2011-12/msg00112.html - initgroups_keys.patch - Folded into 0026-eglibc-Forward-port-eglibc-options-groups-support.patch Change-Id: Ib8e731b212f52b8ff12e2180babbc19970fb1ef1 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-07-31glibc: don't override TUNE_CCARGS for MIPSDmitry Eremin-Solenikov1
Overriding TUNE_CCARGS this way breaks MULTILIB setup for MIPS. This override disables multilib handling of tunes for TUNE_CCARGS, thus enforcing glibc's TUNE_CCARGS to the TUNE_CCARGS of main DEFAULTTUNE. Glibc perfectly build without this override for both simple and multilib cases. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-16glibc: print PN when bbwarnRobert Yang1
The current warning is: WARNING: glibc: unable to generate header for spray.x Which is easier to debug than: WARNING: unable to generate header for spray.x And remove the file before generate it again to fix the warning when recompile: file `bootparam_prot.h' already exists and may be overwritten WARNING: unable to generate header for bootparam_prot.x file `nlm_prot.h' already exists and may be overwritten WARNING: unable to generate header for nlm_prot.x [snip] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-07-16glibc: remove invalid ac_cv_path_KSHRobert Yang1
There is no ac_cv_path_KSH in configure, can't find it in config.log after remove, either. (From OE-Core rev: 6b58670d8b8f2d1c1a7d5043652f48a364a0df5d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-12glibc-initial: remove invalid sed commandRobert Yang1
There is no "{ (exit 1); exit 1; }; }" in configure any more, and also remove chmod since sed command is removed. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-07-07ldconfig-native: Add 64-bit flag for ELF64 entriesYuanjie Huang2
ldconfig-native was grepped from an old version of glibc, and its output lacks neccessary 64bit flag in entries. Due to this defect, ctypes.util.find_library() python function fails to detect any library due to the old file format that ldconfig-native creates. This fix sets architecture-dependent 64bit flags for 64-bit ELF. Since the host's elf.h may not have definition for new AArch64 machine type, a work-around is added to correctly flag 64-bit ARM libraries. Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
2015-07-07glibc: fix typo in add_resource_h_to_wait_h.patchAndre McCurdy1
Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-23staging: Strip files in sysrootRichard Purdie1
Add functionality to strip binaries/libraries going into the sysroot. Whilst this does fractionally slow down the build, it also significantly reduces the size of the sstate cache files. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-06-03glibc: ignore for musl/uclibc but only for target recipesKhem Raj2
we still need nativesdk or native recipes for libc to come from glibc, but only be ignored for target recipes types Change-Id: Ibaf8114f2aef63f1eadf493b264e78cd928535a0 Signed-off-by: Khem Raj <raj.khem@gmail.com>
2015-06-03glibc: remove duplicate --disable-nscd from EXTRA_OECONFAndre McCurdy1
An appropriate --enable-nscd or --disable-nscd option is added to EXTRA_OECONF based on the 'libc-inet-anl' DISTRO_FEATURES check. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>