matchbox-session-sato: install GConf values directly instead of using schemas

Because both matchbox-session-sato and settings-daemon were attempting to
install their preferred values though schemas there was a race as to which ones
were used.

Revert matchbox-session-sato back to writing the values directly, adding a
dependency on gconf-native so that this can happen on the host.

(From OE-Core rev: 90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

elfutils: split libraries into separate packages

(From OE-Core rev: 2b9db2c81bf55527ba3a44fbf94762e5009642a4)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gcc-4.8: Fix GCC ICE on arm

armv5t was seeing ICE on code from elfutils it has been fixed upstream
so lets backport it.

(From OE-Core rev: 6c50d60ce3fd7242e67a531d5875edeb8b7a3651)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gcc-4.8: Refactor gcc-4.8.0 patch files.

(From OE-Core rev: 16ab55220c4b602a8406c7a4405c737caae5907b)

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gcc-4.8: Add recipes

(From OE-Core rev: c850415a1bdbb9268114d90fd0fc4cb3479de9c5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

powertop: add 2.3

With all tweaks from 1.13:
- uclibc buildable
- libncurses instead of libncursesw

Changes from v3:
- proper update-alternatives path

(From OE-Core rev: 188862de64bc2b61f8510082c8a6e5929d2b79d1)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

connman-gnome: Replace broken png files

connman-signal-*.png files were corrupted and this caused
warnings when starting connman-applet.
The patch overwrites the upstream png files.

[YOCTO #4060]

(From OE-Core rev: 2a641a22a1ee70b3fa66f3ec373c965c5ba55c94)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gconf: silence some spurious errors

The postinstalls were producing errors like this:

  (gconftool-2.real:10095): GConf-WARNING **: Client failed to connect to the D-BUS daemon:
  Using X11 for dbus-daemon autolaunch was disabled at compile time, set your DBUS_SESSION_BUS_ADDRESS instead

These are harmless but distracting, so take a patch from upstream to silence
them.

(From OE-Core rev: bc0a4f6e4d01d5912c2589efa9b69d7eda462f73)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package.bbclass: ensure license excluded files aren't packaged

An excluded package left its files behind, which meant they could end up in
another package instead, meaning we could ship GPLv3 binaries even with GPLv3
in INCOMPATIBLE_LICENSE. Skip the files belonging to the excluded packages to
prevent this from occurring.

(From OE-Core rev: c045bfe6b991006ac80f0e2d06a8917ae58d9262)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package.bbclass: add LICENSE_EXCLUSION to vardeps

Ensure that changes to INCOMPATIBLE_LICENSE re-run do_package for affected
recipes.

(From OE-Core rev: b9b187f8a0f513e676cd3d18f71d1055445f29fa)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

png: fix over-zealous warnings about transforms

libpng 1.6.0/1.6.1 emits warnings about function ordering when there isn't a
problem, which causes Cairo to fail loading images.  Take the patch from
upstream to fix this.

(From OE-Core rev: 50f823557cb5857dfe585a9da88bb8f61ebfba99)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

cairo: drop transform patch, it's been rejected upstream

This fix was rejected by upstream, the correct fix is actually to fix libpng.

(From OE-Core rev: f7f8ec1197ec64620c80e13214dc395ab3e12afc)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

u-boot: Add UBOOT_LOCALVERSION to control version string

* Add a variable called UBOOT_LOCALVERSION which when set will
  place a version string in the .scmversion file of the u-boot
  sources.  This string will be picked up by the u-boot Makefile
  and will be appended to the u-boot version.  This is done to
  make it easier to identify what revision of the u-boot sources
  are being run.  For example you can use a setting like the
  following to add the short commit id to the u-boot version
  string:

UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"

(From OE-Core rev: 566298409408c6103f7a9871bb13ae5449c4fd64)

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

python-setuptools: Improving the runtime dependencies

When trying to import setuptools on a minimal image, it reports that some
python module is missing. We add those missing python modules as runtime
dependency.

(From OE-Core rev: c5de114f63fe3d60a48622ec5be8fa34ce177191)

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gnome-icon-theme: add missing icon-cache inherit

When installing this manually the icon cache won't get refreshed.

Rearrange recipe to comply the the styleguide as well.

(From OE-Core rev: a0643812b05cf7ed8b6f530f81925f60089c2410)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

grub-efi-native: fix build on modern distributions without gets()

O irony: the grub2/gnulib nag macro that says "don't use gets, use fgets" breaks the build if you're using a recent (e)glibc release that has gets removed.

Fedora already #if 0's the check in grub, so I stole their patch.

(From OE-Core rev: 261e377b08388a288ee521a3629877b89e18e42b)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libpng: update to 1.6.1

This attempts to fix [YOCTO #4060]  - connman-applet spews warnings, but with this one PNG images still don't work in weston :(

The ARM NEON option was added because the autodetection code in configure.ac is broken:

/usr/lib/weston/weston-desktop-shell: symbol lookup error: /usr/lib/libpng16.so.16: undefined symbol: png_init_filter_functions_neon

License checksums update due to date and package version changes:

index e95d359..d86a7da 100644

(From OE-Core rev: e31ef0211c2cb18c322517a44b714895e51284e1)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lttng: updated lttng-ust to 2.1.2

lttng-ust: upgrade to the latest version 2.1.2
Also updated HOMEPAGE and BUGTRACKER.

(From OE-Core rev: d18cec89e7afd05473232e587893334c4f921b41)

Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

pulseaudio: install alsa mixer data files

These data files are required for module-alsa-card to load properly

(From OE-Core rev: 8dda0dc79f5c90f8d40450ba6215f44edcbacb8f)

Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

image.bbclass: change the logic when intercepts fail

Due to some issues with postinstalls that register hooks, we changed the
logic a bit. Now, all postinstalls that register hooks will return
successfully and only after, if hooks fail, mark the package as unpacked.

(From OE-Core rev: 82dae98d0eb771c05e57635f0f8763b118d8177e)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

pixbufcache.bbclass: do not exit 1 after installing intercept hook

This will allow to register, in a single postinstall, multiple hooks.

(From OE-Core rev: b396138ee081c8f5dddbaab0e374787ba2e31029)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gtk-icon-cache.bbclass: do not exit 1 after installing intercept hook

This will allow to register, in a single postinstall, multiple hooks.

(From OE-Core rev: 2cd244d6c93ec6d39e2649de64575c365bd4238d)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

fontcache.bbclass: do not exit with 1 after installing intercept hook

This will allow to register, in a single postinstall, multiple hooks.

(From OE-Core rev: 9553874cf02ba443aff1bbead56bacfcda9bb6ca)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

build-appliance: Update to latest dylan revision for release

(From OE-Core rev: 94e3f18214e2e35076c52ed27252073f788ec01f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

dpkg: Correct paths in postinst

The postinstall needs to reference $D, not ${D} which would get expanded
by bitbake. This allows postinsts to run correctly on the target system.

(From OE-Core rev: 6573685a5374034df065c41bbe71c7ac49e4b9a4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: depend on libgcrypt

Although libgcrypt support is optional, its development files are
are always required to expand AM_PATH_LIBGCRYPT.  Build might fails else
with

| libtoolize: copying file `m4/lt~obsolete.m4'
| configure.ac:446: warning: macro 'AM_PATH_LIBGCRYPT' not found in library
| ...
| configure.ac:446: error: possibly undefined macro: AM_PATH_LIBGCRYPT
| autoreconf: .../autoconf failed with exit status: 1
| + bbfatal 'autoreconf execution failed.'
| + echo 'ERROR: autoreconf execution failed.'

(From OE-Core rev: c7fe1d0085339e55566989b96d4d48412f0fa47d)

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

udev: disable systemd support

If we want systemd support we use systemd's udev, so disable systemd
support in this udev to avoid packaging the unit files.

(From OE-Core rev: 36aa37e693bcb76a96761847dbef6a015d96fd98)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

udev: drop dependency on udev in libudev

libudev previously depended on udev, but this causes problems with multilib
if the user wants to install two variants of libudev as they'll pull in two
variants of udev, which will conflict.

Instead, remove the dependency and rely that the image pulls in udev in some
way, such as the commonly used packagegroup-core-boot.

(From OE-Core rev: 6168ea4e00fd1c8296fe770fa9e2ef00018f5621)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

xserver-xf86-config: set DefaultDepth to 16 for qemumips

Apparently, the default qemumips color depth was set to 8 and the colors were not
displayed properly. cirrusfb driver doensn't seem to accept color depth
as a kernel parameter, so we have to do it here.

[YOCTO #4340]

(From OE-Core rev: 876e020be334a9350094dbd1a29b9e49eceed603)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

perf: Ensure license is handled correctly

The do_populate_lic task has a race with the recipe since it relies on the
kernel being populated in the sysroot. This patch adds in the explicit missing
dependency.

[YOCTO #3534]

(From OE-Core rev: 578937213c6db9fa99981778ce61210e391b19a7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

psplash: Fix multilib build

The update-alternatives for multilibs are broken and nothing provides psplash in a
multilib build. This fixes the multilib code.

(From OE-Core rev: db1f6b24ddb2a19fb16b2ebb948bb3274b7ac295)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package_ipk: Ensure the status file exists

The postinstall for the opkg run-postinst hook checks for the existence of this
file. We therefore ensure it always exists during image generation.

(From OE-Core rev: 540cf355599e555615ed9684c3b480463588eb78)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package.bbclass: Add useradd variables to PACKAGEVARS

THe USERADD_PARAMS and similar group variables are package specific variables
which should get added to the vardeps of the packaging process. This
change also ensures they get remapped correctly by the multilib code.

(From OE-Core rev: 805add18e7b917aaef61c82c0b5f2e9682af1d0d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

multilib: Ensure we map the USERADD_PACKAGES variable

If we don't do this, multilib packages don't have any code
added to the postinstalls to handle user additions.

(From OE-Core rev: b10d17d1b03fd0564103a6998f218d0968d1032b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gst-plugins-bad: Disable neon, its not on DEPENDS

Otherwise this setting "floats" and leads to non-determinstic builds.

(From OE-Core rev: 4eea01e9d775f2e56958a8bb194aadd8a242946d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

build-appliance: Update revision to dylan release

(From OE-Core rev: 2453504004cfb6c9b5030b557f421e580802a280)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: Fix udevd init script so sysvinit in systemd mode works

Commit http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=f76d4b3549ca220fa4bf84db2756ab45e11d06a3
moved volatiles handling for /run to the udev code only. This breaks
sysvinit+systemd combined systems when building sysvinit images.

This patch hacks the udevd init script in systemd to provide
the missing symlink allowing the sysvinit images built with udevd
from systemd to work correctly.

(From OE-Core rev: 6c6e5dc0baccd0904f785b1f80f39b5f530779cf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

util-linux: fix systemd service in multilib

Use ${PN} when specifing service files so that they continue to get packaged
with multilib.

(From OE-Core rev: d394d27b66cbeb4e57017d2a49605243586477ac)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: fix -dbg package with multilib

When libdir isn't /lib the files that are in nonarch_base_libdir were being left
out of the -dbg package.

(From OE-Core rev: 60bb2f795a0b3e83de5861185446992fb91ffba0)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: hard-code the syslog service file

Previously this was using ${PN}-syslog.service, which changes with multilib.

(From OE-Core rev: ee36f997e68f5a995baf361191cef7a46ff51203)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

udev: explicitly package nonarch_base_libdir

When using multilib this doesn't get caught by the default FILES_${PN}, so add
it.

(From OE-Core rev: 53f1540780e5d4e8035118a1920202735bd0a370)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: Effectively revert the move to /sbin

This effectively reverts the move systemd's libexecdir to /sbin.  This caused
too many issues in other places and was not well enough tested this close to
release.

Rather than use base_libdir, the nonarch version is used to try and give some
chance of multilib not being totally broken in the release.  Also some variables
are used that mirror the systemd build system to reduce the risk of using
variables that "work" in the general case but will break with multilib.

(From OE-Core rev: e921d43e213f93da176fd27e48b557f802443dec)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

seperatebuilddir: add systemd

(From OE-Core rev: 39f9e48558003601d4eec181e32fc76b68df5b5a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: fix out of tree builds

(From OE-Core rev: 79b7c56cb5d6a0b75e7df01fd3cfef4111bf69ae)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

udev: remove explicit path to udevadm

(From OE-Core rev: cc0f22cd1e93cc25647add1a3339e150572e4fce)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

alsa-utils: Use pkg-config instead of hardcoded udev paths

(From OE-Core rev: b92a3e9d093bc9421aa38a40bc6bfd559a16b3be)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

packagegroup: Add init-manager sanity check

Currently, you can set VIRTUAL-RUNTIME_init_manager to an init system that
isn't in DISTRO_FEATURES. This leads to head scratching over unbootable images.

This adds a sanity check which ensures more valid systems are built.

(From OE-Core rev: c72ec4b52827f75351790eab483d258b2e87611a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

udev: Effectively revert the move to /sbin

This effectively reverts the changes made in b49ddeb11c0319b7ece278fd7cef6b0223114ca9
to move udev's libexecdir to sbin. The changes caused too many issues in
other places and were not well enough tested this close to a release.

Rather than use base_libdir, the nonarch version is used to try and give some
chance of multilib not being totally broken in the release.

(From OE-Core rev: c50e50fdafad378d75b7b74259a3d55ca0fe3d18)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

pulseaudio: Set udev variables using pkg-config

(From OE-Core rev: 2c948d1cfdd070c8ce6bf0ee940a345a31407663)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bluez4: Set udev variables using pkg-config

(From OE-Core rev: b8b275c263493e114baefcef94c68743d89329b7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

pcmciautils: Use pkgconfig to set udev variables correctly

(From OE-Core rev: e177bad3c5f2d37fe7a0092c22cc3dfc556f3dea)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package.bbclass: Fix populate_packages for glob expansion issues

If we put a valid glob like "*/foo/*" into FILES, populate_packages
breaks with a "file exists" message. This is because the glob expansion
does not have "./" prefix however there may already be an entry in
the seen list which does have such a prefix. The easiest/simplest fix
right now is to add the prefix if it doesn't exist which only happens
for certain globs.

(From OE-Core rev: 138c5f3af892e33f576fc7dd268e122b179f82a1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: fix mount issue

When the mount command is not given the filesystem type to mount, then
it will try all the known filesystems. However, when a filesystem is not
supported by the kernel, the mount function call will return ENODEV.

The following patch, ecd90bc6aa63da2aef2513ac090d4b426b2b719c,
introduced a problem because it bailed out on ENODEV too. Instead it should
have only bailed out on ENOMEDIUM.

[YOCTO #4308]

(From OE-Core rev: 82320d2074572477f26887eddc51dc2a1dfea403)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

augeas: Fix missing files with separate build directory

${datadir} was empty when building ${B} != ${S}, this patch addresses that
problem and means the -lenses package is no longer empty.

(From OE-Core rev: ee3b0d8fbe42a3c813039850886b5bf97544eb15)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libpam: backport patches from upstream

Backport patches from linux-pam git repo to fix test case
tst-pam_pwhistory1 failure.

[YOCTO #4107]

(From OE-Core rev: 65e4a9f050ae588ec794808315a206d94ca7a861)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

consolekit: Fix ${S} != ${B} issues with pam enabled

When pam is enabled an extra plugin is build and it references an incorrect directory
when separate build directories are used. This patch corrects the issue.

(From OE-Core rev: a6e91db198ae5b77986de25331631d894c7b97d1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: Fix shell variable assignment spacing

(From OE-Core rev: e389d47524297b3def665a9a3668b6de09e5d20a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: use AC_CHECK_TOOL instead of AC_PATH_TOOL when checking objcopy, strings, gperf

* with external toolchain I have different HOST_PREFIX and HOST_SYS
  AC_PATH_TOOL is using HOST_SYS as prefix and fails to find objcopy
  then it tries objcopy without prefix which is found on host, but
  that objcopy does not work for arm libs
* with internal toolchain gperf is not prefixed with HOST_PREFIX, but
  fallback to "gperf" only finds the one in native sysroot first
* based on http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037985.html

(From OE-Core rev: 6ae99136f1c1c59f4e55331c43cf0c0bac5abcdd)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

separatebuilddir.inc: disable libmusicbrainz

(From OE-Core rev: 7863a3c7f2d619c63ddb25883a774af6c9eb3143)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

linux-yocto/3.8: Makefile: add -grecord-gcc-switches if using -mfentry

    Commit a2546fae [ftrace: Add -mfentry to Makefile on function tracer]
    adds support for using -mfentry when possible, whenever the ftrace
    CONFIG_FUNCTION_TRACER option is enabled.

    This unfortunately causes bogus dwarf debuginfo to be generated:

      gcc Bug 54793 - the location of a formal_parameter is not started from a
                      function entry with -mfentry

      http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54793

    This can be fixed by applying the gcc patch above, which will be
    present in gcc-4.8, but in the meantime, the problem is currently
    being worked around in different ways by various tools.  One of those
    tools that we support in Yocto, Systemtap, requires the DW_AT_producer
    string contain -mfentry, which means that it's assuming
    record-gcc-switches is also used:

      SystemTap Bug 15123 - workaround for bad debuginfo for -mfentry
      http://sourceware.org/bugzilla/show_bug.cgi?id=15123

    The lack of -grecord-gcc-switches and therefore a missing -mfentry
    string in Yocto leads to the following Yocto bug:

      Bug 4099 - Crosstap script check fails
      https://bugzilla.yoctoproject.org/show_bug.cgi?id=4099

    Which is what this patch intends to fix.

    It only affects architectures that HAVE_FENTRY when
    CONFIG_FUNCTION_TRACER is turned on and in any case is just adding to
    the debuginfo, so there doesn't seem to be much risk to adding it.

(From OE-Core rev: c04f611aa4bf77867fe78a005d09434226feb62c)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qt4-embedded: bump PR to allow removal of meta-oe bbappend

The meta-oe bbappend only increments PRINC, if we bump INC_PR here we
can remove that.

(From OE-Core rev: 9e74a1c9cb753a426b55544cc41860edb98e8d33)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

packagegroup-qte-toolchain-target: bump PR to allow removal of meta-oe bbappend

The meta-oe bbappend only increments PRINC, if we bump PR here we can
remove that.

(From OE-Core rev: 7aadfe2f293da665236aede5cb03f801d420d050)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qt4-x11-free: bump PR to allow removal of meta-oe bbappend

The meta-oe bbappend only increments PRINC, if we bump INC_PR here we
can remove that.

(From OE-Core rev: 976a06f41558d2246173414658d9f7b8eee193d6)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

wpa-supplicant: don't call DBus init script directly

After installing Avahi we need DBus to reload it's configuration.  In a
pure-systemd image there isn't a DBus init script to reload, so cut out the
middleman and just sent SIGHUP to all running dbus-daemon processes instead.

(From OE-Core rev: d6fb028de172bb649b905b605f6ddc8402af859a)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

hicolor-icon-theme: bump PR to allow removal of duplicate from meta-gnome

The recipe in meta-gnome has PR = "r1" so make it the same here and
avoid PR going backwards for existing users of meta-gnome when the
recipe there is removed.

(From OE-Core rev: 200685bde7ea222891e1dde27f086caea9216e48)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

avahi: don't call DBus init script directly

After installing Avahi we need DBus to reload it's configuration.  In a
pure-systemd image there isn't a DBus init script to reload, so cut out the
middleman and just sent SIGHUP to all running dbus-daemon processes instead.

(From OE-Core rev: b3e468294a0723b3ceafe2022bf9d735eee64678)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

xserver-xorg: fix segfaults for ARM SoCs

(From OE-Core rev: f45a03b510479f6c27b24a0fd8d0c661674495e1)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

runqemu-internal: Drop distcc support

The distcc support is clearly unused and broken, might as well drop the
remaining code fragements.

(From OE-Core rev: 1a70a3225947aa45f3e1f377d50a5865aac64d2b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

cairo: fix builds with libpng 1.6

libpng 1.6 emits more warnings than before, and is also stricter with function
ordering.  Fix the function ordering when reading PNGs, and stop treating all
warnings as errors.

(From OE-Core rev: 55d00b750f5c45e583abef406c96416cd6a8caa7)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

README.hardware: Update mpc8315 load address

The kernel size has grown to a point where the original load address might not work
due to memory region overlap. This updates the instructions to use larger memory
addresses which avoids the problem.

[YOCTO #2430]

(From meta-yocto rev: 6b7cd4aa50f91c4ebb8a61c9d7fea616be63f470)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

initramfs-live-install*: fix the "install" boot option

The install boot option was giving the following error when one tried to
install the live image on a  permanent storage of a BSP.

cat: write error Invalid argument
Installation image failed
sh: can't access tty: job control turned off

Further digging into the issue, found out that the install script was trying
to do this:
 cat /proc/mounts > /etc/mtab

And in the base-files recipe the /etc/mtab is made soft link to /proc/mounts.
So the cat command was failing to write on /etc/mtab. As the contents of
the /proc/mounts is already reflected in the /etc/mtab file due to the
symlink-ing, there is no need for this step to recreate /etc/mtab in the
install script. So just removing this unnecessary step, which solves the
install issue of the live images.

Fixes this bug:
[YOCTO #4229]

(From OE-Core rev: f8663eac872882e94d956b1b604304e92b865766)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

mesa: don't fail if x11 isn't available

Patches backported from mesa Git and from mesa-dev mailing list.

(From OE-Core rev: f704bb42062f2ac15edaad36497a8d2815b8b8b2)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

openssl: update range information in man-section.patch

do_patch failed after upgrading to openssl-1.0.1e. Log:
| ERROR: Command Error: exit status: 1  Output:
| Applying patch man-section.patch
| patching file Makefile.org
| Hunk #1 succeeded at 160 (offset 26 lines).
| Hunk #2 succeeded at 626 (offset 19 lines).
| misordered hunks! output would be garbled
| Hunk #3 FAILED at 633.
| 1 out of 3 hunks FAILED -- rejects in file Makefile.org
| Patch man-section.patch does not apply (enforce with -f)
| ERROR: Function failed: patch_do_patch
| ERROR: Logfile of failure stored in:temp/log.do_patch.14679
| ERROR: Task 646 (virtual:native:openssl_1.0.1e.bb, do_patch) failed with exit code '1'

Change-Id: Ib63031fdbd09443e387ee57efa70381e0aca382c
(From OE-Core rev: ded738b945b6af6c73a1c5f1b4cd5ad1b6ac06c0)

Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

kern-tools: fix custom repository BSP generation

Updating the SCRCREV to pick up the following fix

    updateme: use absolute path for generated BSP descriptions

    When a custom BSP is used, a top level BSP is generated by the tools and fed
    to the build system just as a user defined BSP would be located and
    passed. The location of the generated file is placed in the top_tgt file,
    which is used by subsequent stages. A relative path was being placed into
    top_tgt, which binds the build to a particular directory structure and
    working directory.

    The location of parts of the build have changed, and this relative path is
    no longer accurate. Changing it to an absolute path solve the build issues
    related to custom BSPs.

(From OE-Core rev: 2d7b2478a3d48a5686afde790c378ee2f69b8e59)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

coreutils: add realpath to alternatives

New coreutils (8.15 onwards) build /usr/bin/realpath, which busybox also builds.
Add it to the alternatives handling to avoid file conflicts.

(From OE-Core rev: 826c18eb1c69f5e3689b5b0ef188f74ae930a050)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

connman: Fix wrong INC_PR reset

Other recipe versions in other layers
may be using connman.inc, so by resetting
INC_PR they go backwards in version.
Set the INC_PR correctly.

(From OE-Core rev: 2d56006cd88233c7f1f15a44f72a04bd0e441b25)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

initramfs-live-boot: explicitly depend on udev-extraconf

init-live.sh depends on udev performing automounting, which happens in
udev-extraconf.  Explicitly depend on it so that we always have it installed.

(From OE-Core rev: a608d74e69ca1efe5f2b176c000fb8212797d056)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: data: fix performance regression

BitBake commit 7c568132c54a21161de28907159f902462f1e2bb resulted in a
fairly serious performance regression during parsing, almost doubling
the time taken to do a full parse and almost certainly impacting
performance during building. The expandKeys function is called
frequently, and if we avoid using keys() and instead just use the normal
variable lookup mechanism, performance is restored.

(Bitbake rev: 034b392e9877309f15940b258fc2c16f16fb40b5)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: fetch2: rename file with bad checksum instead of removing it completely

* this can be useful when someone wan't to compare old file with
  bad checksum and new one

(Bitbake rev: 33c6b93597dd43ab03ce7b62ba3eeb1893a68c38)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob: Refine sorting mechanisms in Hob

-refine sorting functions for each column from recipe list page
and package list page
-sort correctly size column from packages list page
-set default sroting order and secondary sorting criteria
-make included on included recipes/packages no sortable

[YOCTO #2346 & #4194]
(Bitbake rev: 56822176e3d5e613654a46c983d2f979d7a9eebc)

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: monitordisk.py: disable inode checking for btrfs

The btrfs doesn't have static inode, so disable the inode check for it,
the previouse patch has set it:

minInode = None

But this is incorrect, the minInode is just a temporary variable, it
should be:

self.devDict[k][2] = None

[YOCTO #3609]

(Bitbake rev: 7e45149c292bc92314af9b42962fde8f603a179f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: fix bootup with 'ro' by re-adding util-linux-mount to RDEPENDS

When using busybox mount the filesystem won't get remounted as 'rw' and bootup will fail.

This fixes the regression seen after switching from 'danny' to 'dylan'.

(From OE-Core rev: 15a91361a0b5a44161d2dbcf2be6240d86123ad9)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: Add inetd related files

Add back inetd and inetd.conf files which are needed if
CONFIG_INETD is enabled in the defconfig. Grabbed these
files from oe-classic

This patch is based on the previous patch for denzil:
http://patches.openembedded.org/patch/33235/

(From OE-Core rev: 929c738787b6f513ce235ed5f7753408a570d632)

Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: detects customized configs when do_install

After using 'bitbake -c menuconfig busybox' to customize defconfig,
do_install fail to detect the changes. Grep configs in ${B}/.config
instead of ${WORKDIR}/defconfig.

(From OE-Core rev: 5c088c2d3b23026752649d077ee44fe3dbe26aa4)

Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

allarch: Drop various problematic allarch usages

In each of these cases allarch is used where the package in question has a
dependency on things which are not allach and change when MACHINE is changed.

This leads to a rebuild of the package each time MACHINE is switched and
the sstate checksum changes. The dependencies in question are not suited
be being marked as ABISAFE.

(From OE-Core rev: 087a680429efa713a98fbb89f927b046fe07f87c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

nfs-export-root: Update to use packagegroup naming

task packages were renamed to use packagegroup so fix this reference.

(From OE-Core rev: bcd68f11e479e8a3a95793ab2ed65202c0f71d84)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qemuwrapper-cross: Inhibit default dependencies

This wrapper script doesn't need a compile or any of the default system
dependencies so lets inhibit them. This also stops the script
being rebuild every time the toolchain changes.

(From OE-Core rev: 7f72562d274dd2c37ce9262bb7fb8a8a6a9a37df)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

encodings: Set RDEPENDS correctly

The .inc file sets RDEPENDS for the general font case but the dependencies
don't apply to this recipe. This removes those dependencies, simplifying the
dependency chains a little.

(From OE-Core rev: 71b3a156c11d01565f546f33e3f1e1bea2fafdff)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

ttf-bitstream-vera: Use fontcache class for postinstall

Using the fontcache class means we can run the postinstall at build time
so this is generally more efficient.

(From OE-Core rev: 00cc684885efa555f7eac7653482f72095b1c443)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

update-alternatives: Ensure DEPENDS is correct in multilib case

Ensure that the DEPENDS we're adding is correct in the multilib case by
including MLPREFIX, fixing unnecessary dependencies in those images.

(From OE-Core rev: 1fa8909e24866ffada75daf63225c8daa000b9be)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

kernel.bbclass: Ensure we have correct version information in deploy data

Currently the names used for the kernel in deploy will contain "AUTOINC"
instead of the final incremental numbering. This fixes the problem by
ensuring data is obtained from the PR service and using the PKG* variables
instead of PE/PV/PR directly.

[YOCTO #4293]

(From OE-Core rev: 1392f959cb8cd50b5a4492899e54f3ed68ef56d7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

oe.terminal: add tmux classes

This adds two new Terminal classes. It's separated into two, so that opening
a split inside a tmux window is preferred to the other terminal types, but
opening a tmux session is prioritized only slightly higher than screen.

- tmuxrunning: Open a new pane in the current running tmux window. Requires
  that the TMUX variable be added to the env whitelist to use it.
- tmux: Open a new tmux session

(From OE-Core rev: 10f64d202ceb230c3c79e09dce182ffce94d1117)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

rpm-postinsts: remove erroneous call to /etc/default/rcS

This doesn't work when the initscripts package is not installed (e.g.
when using systemd only) and is not even needed.

(From OE-Core rev: 6c972598c6da17fbec7a4582eb593c31f4283275)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

udev-extraconf: Add -o silent to auto mount for mount.util-linux

This will silence some of the noisy output from mount.util-linux and the kernel
when trying to automount filesystems or devices. Busybox does not accept the silent
option, it uses a loud option instead.

[YOCTO #3935]

(From OE-Core rev: be218292ee3f05afe47545aa8e1625452e0cd614)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qemu: define fdt_t types in libfdt_env.h from qemu

* fixes
In file included from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/libfdt.h:55:0,
                 from /home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/work/x86_64-linux/qemu-native/1.4.0-r0/qemu-1.4.0/hw/arm/../../device_tree.c:28:
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:58:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:59:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:60:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:61:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:62:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:63:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:64:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:67:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:70:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:73:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:77:2: error: unknown type name 'fdt64_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:78:2: error: unknown type name 'fdt64_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:82:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:87:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:88:2: error: unknown type name 'fdt32_t'
/home/oe/setup-scripts/build/tmp-angstrom_next-uclibc/sysroots/x86_64-linux/usr/include/fdt.h:89:2: error: unknown type name 'fdt32_t'

(From OE-Core rev: dfb0c2cf9799d084a76aa92e243c743d7ff05db8)

Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

initrdscripts: look for new systemd-udevd location

As per the previous commit, systemd-udevd is now in /sbin/systemd/.

(From OE-Core rev: ff0fd25206c3c75921d51cb80bcb6c94ca47b405)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

systemd: move the binaries to /sbin/systemd

As with udev, placing binaries in /lib breaks our current multilib
implementation.  Change the rootlibexecdir to /sbin/systemd so that binaries
don't move in multilib situations.

(From OE-Core rev: d612ca261d12e89e96675c24d9d7456319179720)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

hello-mod: Ensure the produced package name begins with kernel-module-

The special key kernel-module- is necessary for the system to avoid a package
rename when installing a multilib image.  For example:

local.conf: IMAGE_INSTALL_append = " hello-mod"

bitbake lib32-core-image-minimal

The system will translate names and prepend 'lib32-', unless the package
begins with kernel-module-.

(From OE-Core rev: b847f87f4213db917d6760cd399c0afae996cf23)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package/image.bbclass: Fix multilib rprovides

allarch multilib recipes are meant to provide a list of different multilib variants.
Unfortunately since the pkgdata also has mappings for these, they get mapped back to
the original package name which means the effect is undone at package creation time
when the remapping code is called.

This patch adds in a conditional to break that chain meaning the packages get
the correct RPROVIDES and image builds work correctly with opkg.

[YOCTO #3453]

(From OE-Core rev: 1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

classes/sanity: fix handling of bblayers.conf updating

Fix the fairly long-standing problem of treating a newer bblayers.conf
in the same manner as an older one (reporting that it had been updated
even if nothing was done). The recent work to do a reparse without
having to manually re-run bitbake turned this from an annoyance into an
endless loop, so it had to be fixed.

As part of fixing this the following changes have been made:
* Extensions are now implemented using a function list, so distro layers
  can add their own functions which should either succeed (indicating
  they have successfully updated the file) or raise an exception
  (indicating nothing could be done). The functions are called in
  succession until one succeeds, at which point we reparse.
* If we can't do the update, the error message now says "older/newer"
  instead of just "older" since we only know the version is different.

(From OE-Core rev: 46b00fdfc9d1e3dc180de087bae2682a1baa2954)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>