toolchain-scripts.bbclass: Export M4

some packages use M4 variable from environment and sometimes
its hardcoded to /usr/bin/m4 if not found in environment. Lets
define it such that it is picked from path

(From OE-Core rev: 06c5593d15f206458b9a5b45ed1229abfee16e95)

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

cross-canadian.bbclass: add native chrpath dependency

In order for the RPATHs in 32bit toolchain binaries to be relocated
properly, chrpath >=0.14 is needed.

[YOCTO #3161]
[YOCTO #3201]

(From OE-Core rev: 71c71b972100803d33fbb062a237e8a15167387b)

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

runqemu: allow multiple unfs instances to run simultaneously

A miscalculation in the way the port numbers of mountd and nfsd
are created was causing conflicts when starting multiple instances
of qemu using userspace nfs.

Thanks to Rudolf Streif for proposing this fix!

Fixes [YOCTO #1969]

(From OE-Core rev: 94eef772c283170d19ba92c8de0054cd093fc487)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

runqemu-export-rootfs: improve rpcbind error detection

mountd requires rpcbind or portmap. Check that one of these
services is running before doing anything else, and report
a user-friendly error when they are not found.

(From OE-Core rev: 16d6ec51f4b976c9b86a8b6bf6251089df2d2732)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

runqemu-export-rootfs: use consistent whitespace

(From OE-Core rev: b05185240669e0ae811a23620913b35ca99493fb)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

common-licenses: Adding bzip

bzip requires it's own specific license.

(From OE-Core rev: df2b756436b90f8f9ff229ba64d0af30d9d4f923)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob/hobeventhandler: Throw an exception if runCommand fails

- throw a Hob exception if runCommand returns 'Busy' or
'No such command'

[YOCTO #1245]

(Bitbake rev: 5a8e3baa66f845599a616f080a7efce81ecda631)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

build-appliance-image: Fix spacing in DESCRIPTION

Fixes [YOCTO #2636]

(From OE-Core rev: 831b88806a3cb0125003aa6d3348716bcfd662a1)

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

shutdown-desktop: ensure the postinst script succeeds

When the hostname isn't qemuarm the grep fails so the postinst fails. Stop this
happening by explicitly evaluating true.

[YOCTO #3224]

(From OE-Core rev: 8848ea6793ddaab61c9dad250ec578d68d7d087d)

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

sato-icon-theme: use gtk-icon-cache helper class

Instead of explicitly updating the icon cache use the helper class that also
forces a loader update at the same time.  This eliminates the possibility of
updating the icon cache without any gdk-pixbuf loaders.

Also check that the Sato icon theme isn't already set to avoid appending to the
file every time the postinst runs.

[YOCTO #2399]

(From OE-Core rev: 9d98dbdae4c05fcf50d546f554a04dc3f0bd66c3)

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

distrodata: Update distrocheck functions

Fix the distro check functions for the change of nativesdk
being a suffix to a prefix. Also added crosssdk as another
case for converting to PN for matching in the distro_tracking

(From OE-Core rev: ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23)

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

bitbake: hob/imagedetailspage: disable the deploy tool for qemu machines

- qemu images cannot be deployed to hardware, even if live
images (hddimg and iso) files are created

[YOCTO #3196]

(Bitbake rev: 001b1c439ffa450cb8728b0fa9469fed63ae9bed)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob/settings: alignment and spacing fixes on "Shared state" tab

-alignment and separation on vertical and horizontal axis
-change controls width
[YOCTO #3188]

(Bitbake rev: a84c466eae7c2616c041faf930163f23834f0685)

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

bitbake: hob/image_details/run_image: Kernel must be set

- when displaying image details, even if the kernel information is not shown, the kernel value must be set (if dealing with qemu) otherwise running the image will throw an error
(Bitbake rev: 334125a98ecb8a938aee4bc530205ad75099361c)

Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: fetch2: raise an exception if user specifies protocol=git with 

It is a common mistake to use http:// and protocol=git when attempting
to fetch from a git repository using the http protocol; if this is
detected then throw an error explaining that you need to use git:// with
protocol=http instead.

(Bitbake rev: 5bc4930c1638db16bcd5f9c8cfc4081f9ffc192b)

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

rpmresolve: fix reporting of multiple matches error

We were mistakenly writing what was meant to go to stderr into the
output file, so when the "Multiple matches" error showed we weren't
actually seeing the matches printed.

Also change the wording of the "Unable to find package..." to "Unable
to resolve package..." instead so that it makes more sense if it is
printed after the "Multiple matches" error.

(From OE-Core rev: c26542eb4e8707b9639ec309a44809a728839db8)

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

buildhistory_analysis: update to use explode_dep_versions2()

Handle where multiple version specifications are present for the same
dependency.

(From OE-Core rev: 1600c916ae410c57a783a5aa35abe07a3f673311)

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

qemu: Fixed running QEMU with virtio error reporting

If vhost_net module is not properly installed,
runqemu script will report the error and
provide the user with a link to the guide.
Also corrected small cosmetic issues in
runqemu script messages.
Also removed <> (read/write) check.

Fixes [YOCTO #3184]

(From OE-Core rev: f7365f62325189b0f9a9a1d440f11f2356c8f01d)

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

wpa-supplicant: don't break the DBus service file

The recipe exports $BINDIR as ${sbindir} and the build system uses this when
writing the DBus service file, so sedding it and replacing $base_sbindir with
$sbindir (/sbin and /usr/sbin) isn't useful when it ends up as
/usr/usr/sbin/wpa_supplicant.

[YOCTO: #3202]

(From OE-Core rev: 41388c3ae0f4d9cd07e1599fbe125123c20820f8)

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

bitbake: providers.py: Fix PREFERRED_VERSION containing epochs

For some reason the code calls int() on the epoch component of any
PREFERRED_VERSION. Since this is compared against strings, the comparison
would always fail. This removes the stray cast and allows epochs
in preferred_version to work correctly.

[YOCTO #3187]

(Bitbake rev: 117b47553970fc5307374cbf500744b7c302efb4)

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

xf86-video-intel: drop libxvmc dependency

xvmc is explicitly disabled, so remove the dependency.

(From OE-Core rev: eb96be4db46039752c44dc37ef676eaac04e3dba)

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

qemu: add wrapper for qemu-mips binary

qemu-mips user emulation binary segfaults when running any kind of
binary. This is due to a MMU access fault in the virtual CPU. This
problem has been introduced in qemu when 4GB of vmem were reserved for
32-on-64 bit.

This workaround will need to be reverted once the proper fix is found.

[YOCTO #3143]

(From OE-Core rev: 53b3103abdf21123b1c7be49b05cfe97a7cd9ed7)

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

e2fsprogs: Don't install findfs

This binary is provided by util-linux nowadays.  Fixes:

WARNING: The recipe is trying to install files into a shared area when those files already exist. Those files are:
     /fast/jenkins/workspace/.../tmp-eglibc/sysroots/x86_64-linux/sbin/findfs

(From OE-Core rev: e71c6bb75239926aceebbb53d158cbf8de6112a4)

Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bzip2 and busybox: Incorrect LICENSE

The license for bzip2 is not quite BSD. I have an email out to the
maintainer to see if we can utilize a common BSD license (or something
else) however, for now, we should revert bzip2 back to a special
license.

As busybox also utilizes a lightly modified bzip2, this also
effects busybox.

(From OE-Core rev: a0b132798d2c1adf79414787b8317327a554f852)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

linux-yocto-custom: Clarify defconfig usage

It is necessary to supply file://defconfig to the SRC_URI when using
a defconfig (it is not implicitly understood as the commentary might
currently suggest).

(From OE-Core rev: 3e244e0e9c10438c2236e56b3de664d4560791f0)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package.bbclass: Fix regression in -dbg packages introduced by explode_dep_versions change

We need to iterate over the dictionary pulling out the values, not take the top
level keys. If we don't do this, we end up with dependencies on the values of
PACKAGES, not library dependencies.

(From OE-Core rev: 7219bca11f554fbe2ed30f1537491987d65e9316)

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

qt4: Avoid circular dependencies with multilib

Without this, circular dependencies are found when attempting to build
multilib versions of qt4 (or bitbake world in a multilib enabled build).

(From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e)

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

bitbake.conf: Add CCACHE_DISABLE to BS_HASHBASE_WHITELIST

If CCACHE is in the whitelist then CCACHE_DISABLE probably should be too.

(From OE-Core rev: c03f76160e3cc3cb4fbf3cee114665c34bff06e6)

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: Add missing INITSCRIPT_NAME_${PN}-hwclock

Fix failures like:

Configuring busybox-hwclock.
usage: update-rc.d [-n] [-f] [-r <root>] <basename> remove
       update-rc.d [-n] [-r <root>] [-s] <basename> defaults [NN | sNN kNN]
       update-rc.d [-n] [-r <root>] [-s] <basename> start|stop NN runlvl [runlvl] [...] .
                -n: not really
                -f: force
                -v: verbose
                -r: alternate root path (default is /)
                -s: invoke start methods if appropriate to current runlevel
Collected errors:
 * pkg_run_script: package "busybox-hwclock" postinst script returned status 1.
 * opkg_configure: busybox-hwclock.postinst returned 1.

(From OE-Core rev: 43b4ffc11874803db37c43b521ce27c51c677c8b)

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

bitbake: hob/hobpages: Generate the title label every time

- the title label is destroyed at page switching (that's why we need
to generate it every time)

[YOCTO #3195]

(Bitbake rev: d6d991c08f66cf9ab27c53075109212ea9129380)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qt4: add 4.8.3 version with negative D_P

* rebased patches, 3 patches are resolved upstream:
  0019-javascriptcore-Fix-compile-error-when-using-toolchai.patch
    resolved in upstream commit 7ac8d8597db1f58b11338f91fb27f6ad8696b34b
  0022-webkit-fix-conflicting-types.patch
    resolved in upstream commit929b4443d53fcf3a7ad1cb9f3af5569e41ef56f1

(From OE-Core rev: b9fc4928bb93ad720c47920db3869d860c531d0a)

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

qt4: PR bumps

* sofar only formal changes, but to test that everything still builds the same

(From OE-Core rev: 054a0e6c850f92c03fbb6314702de4e6318ccd25)

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

qt4: replace all local patches with git patches with headers

* in preparation for upgrade to 4.8.3

(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)

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

qt4: drop patches not used in any recipe

(From OE-Core rev: 5f0684c1d23a3520095a4d450a0c1fa95fa1c7b2)

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

qt4: move patches from files to qt4-4.8.1

* faster lookup in FILESPATH as small bonus

(From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d)

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

qt-mobility: move qt-mobility patches to separate dir

(From OE-Core rev: 8dccc55a623f0c5f3469c7cdf63aa788683aa186)

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

qt4.inc: move more options to separate variables

* make it easier to override them in bbappend
* convert pulseaudio to more common -pulseaudio/-no-pulseaudio form

(From OE-Core rev: 34e3687394c6fa18ef0443d63b8d7d0a68c441e0)

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

qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb

(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)

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

qt4: use releases.qt-project.org instead of get.qt.nokia.com

* releases.qt-project.org has 4.8.1 as well as 4.8.3

(From OE-Core rev: f12df439b893c70a8cd271ff8b8e6d760b78a2b3)

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

qt4-tools-nativesdk.inc: rename to nativesdk-qt4-tools.inc

(From OE-Core rev: 11970283424f213f870ba7e96d70bd507b10bc63)

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

libdrm: Remove Cairo dependency

This causes a build loop, when DRM depends on Cairo depends on Mesa
depends on DRM.  We can safely remove it as it's only one libdrm example
program which uses Cairo, which we won't be needing.  At least it's not
worth the build loop.

(From OE-Core rev: a6d305261dc925210185d8b70fb1a923e012153b)

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

binutils.inc: add vardep on multiarch DISTRO_FEATURE

binutils will build differently if this feature is enabled, so
make the do_configure step depend on it

(From OE-Core rev: 0788cf349fe37ef4a36c626dbc396c97d1ab14d7)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libx11.inc: fix build issues for older CentOS distros

Fixes these sorts of issues present on older gcc (CentOS 5.x in this case)

| cc1: error: unrecognized command line option "-Werror=implicit"
| cc1: error: unrecognized command line option "-Werror=nonnull"
| cc1: error: unrecognized command line option "-Werror=init-self"
| cc1: error: unrecognized command line option "-Werror=main"
| cc1: error: unrecognized command line option "-Werror=missing-braces"
| cc1: error: unrecognized command line option "-Werror=sequence-point"
| cc1: error: unrecognized command line option "-Werror=return-type"
| cc1: error: unrecognized command line option "-Werror=trigraphs"
| cc1: error: unrecognized command line option "-Werror=array-bounds"
| cc1: error: unrecognized command line option "-Werror=write-strings"
| cc1: error: unrecognized command line option "-Werror=address"
| cc1: error: unrecognized command line option "-Werror=int-to-pointer-cast"
| cc1: error: unrecognized command line option "-Werror=pointer-to-int-cast"

Also fixes:

makekeys-makekeys.o: In function `main':
makekeys.c:(.text+0x85): undefined reference to `__isoc99_sscanf'
makekeys.c:(.text+0xa7): undefined reference to `__isoc99_sscanf'
collect2: ld returned 1 exit status
make: *** [makekeys] Error 1

Older libc do not have this defined, we can use the -D_GNU_SOURCE
to the compiler to prevent generating calls to this function and
make linking work

(From OE-Core rev: 83c560ae282c1a28fd2c311c66debd02a69f1678)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Revert "initrd: Spawn an emergency shell when something goes wrong"

This had nowhere near enough testing...

This reverts commit ffb6928f5783e5202d9849c3a185e29be1d41c63.

(From OE-Core rev: f162f0ecc96fdfb564aad968e5b8bc670640ea68)

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

nativesdk.bbclass: Ensure we have chrpath >=0.14

Versions earlier than 0.14 can't cope with 32 bit binaries on a 64 bit
system and vice versa. This results in problems for certain SDKMACHINE
combinations on certain hosts. By ensuring we build
chrpath-replacement-native we avoid this problems and the binaries work
correctly.

[YOCTO #3161]
[YOCTO #3201]

(From OE-Core rev: f89bced26de055817100d0b0e03094b031fcfd48)

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

chrpath: We should provide chrpath-replacement-native and install into a native specific directory

chrpath is assumed to be provided by the build host system. This means
we need to provide a replacement version and install into a specific directory
to avoid races.

(From OE-Core rev: 147c44c882a3dc667c079165d3ddc9d78b702286)

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

gzip: The native version should provide gzip-replacement-native

(From OE-Core rev: 9c2e5b04e40102fc7276fd3a6467725617dc33ce)

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

bitbake.conf: Add chrpath-native to ASSUME_PROVIDED

We assume chrpath is provided natively so it should be listed in ASSUME_PROVIDED.

(From OE-Core rev: 97a3ea712003e8d48dc68c282e656591f39d2d1a)

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

scripts/oe-buildenv-internal: Ensure we detect the SDK/ADT and error out

The SDK/ADT may ship with a python installed which may not have all the modules
need for a bitbake build. We should therefore detect if its already present in the
environment and error out in this case, asking the user to use a clean environment.

This also removes the potential for any other conflict between the two.

[YOCTO #2979]

(From OE-Core rev: 9496d4cd77ae632251b4262b63be857fc4fcb31e)

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

opkg: Convert select-higher-version option to prefer-arch-to-version

This converts the option to maintain the existing behaviour unless the option is
specified. We do specify the option during the builds themselves to ensure what
the users expects is built.

(From OE-Core rev: 0cc479699fe885049625d54c712b500c1b719e75)

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

bitbake: hob: Improved behavior for error reporting window

Scrollbars have now an automatic behavior, depending on
the error's text size and error window size.

Fixes [YOCTO #2983]

(Bitbake rev: 0c0a25672498520fb2c46164f08959dda83c61e0)

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

libart-lgpl: add art_config.h for mipsel

Fixes:
WARNING: Unable to get checksum for libart-lgpl SRC_URI entry art_config.h: file could not be found

which otherwise happens during parsing, even if libart-lgpl isn't being built.

(From OE-Core rev: a9245e0d1dd1bee4ac01fe0c73d95179033ba979)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

opkg: Drop nogpg version since the main version now has nogpg too

(From OE-Core rev: c8197c993c5848576a9c63660ff342571d31a4ba)

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

opkg-native: remove spurious dependency on curl-native

All variants of opkg are currently configured --disable-curl so there
seems no point in depending on it.

(From OE-Core rev: 875f1eb876c17c038a77bc7b7a5fed775d9fd3ea)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libpcap: add dependency on libnl

libpcap uses libnl on Linux to support sniffing mac80211 devices, which could be
useful.

(From OE-Core rev: 052a8406e66c9dcccc1fc506a32cc1706b93467b)

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

galago: remove

Galago has been replaced with Telepathy and Folks, and has been unmaintained for
years.

(From OE-Core rev: b878a9b1af63603779850f420fc0feb2ef78da9f)

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

sanity.bbclass: Fix invalid test for network error

The test for network error in sanity.bbclass was negated.

(From OE-Core rev: 9fcd0866f0e30a50182434f6bcae13bf9575807f)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: Update version to 1.16.0

(Bitbake rev: a579754a04bdcf450e6957dde614a15c11df39e2)

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

bitbake: hob: Further improvements to hob dialogs

1. Replace some labels in the "Build environment" tab
2. 'defaultsetup' changed to 'Default' in the "Image types" tab
3. Fixed the moving icon in the "Output" tab

For more details: https://bugzilla.yoctoproject.org/show_bug.cgi?id=2162

[Yocto #2162]

(Bitbake rev: db7d98569117b7a75262eb555e1c7ae9a421bdf8)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob: Fix 'User selected' tag functionality

- the 'User selected' tag is only used when the user
selects a package
- fix hob to remember which packages are 'User selected'
- if the package is already brought in by some other package,
it should not appear as 'User selected'

[YOCTO #3108]

(Bitbake rev: 2391e9ba7034d4f90bafa5732d8efa8166f69950)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob/settings: Change the 'Delete' button behaviour in the shared state settings tab

-the tab shows an empty mirror row when no mirror is configured
-able to delete the mirror row even if it's not empty(if it's not
the first mirror)

[YOCTO #3189]
(Bitbake rev: d6472608112b8af2e98f247e6f89a7f948b2d020)

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

bitbake: hob/image_details: Remove kernel info from details

- removed kernel information from image details

[Yocto #3002]

(Bitbake rev: 7fc33f0a8a38d9b8984bf884e47e505791536d16)

Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: tests/utils: Add test for explode_dep_versions2

(Bitbake rev: b1b0aabfab3c94c3b515070d0fb4d7819e2548bc)

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

bitbake: utils: Add explode_dep_versions2 to replace explode_dep_versions

The API for explode_dep_versions is flawed since there can only be one version
constraint against any given dependency. This adds a new function with an API
without this limitation. explode_dep_versions() is maintained with a warning
printed when its used in a situation where information is lost.

This should allow a simple transition to the new API to fix the lost dependency
information.

join_deps() is updated to deal with data in either format.

(Bitbake rev: babeeded21827d8d3e7c7b785a62332ee9d45d4f)

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

bitbake: utils.py: Allow explode_dep_versions comparisons to have arbitrary whitespace

Refactor the explode_dep_versions to be more lenient on whitespace values.

The required format is:
   foo (= 1.10)
   foo (=1.10)
   foo ( = 1.10)
   foo ( =1.10)
   foo ( = 1.10 )
   foo ( =1.10 )

(Bitbake rev: 39c1c12c58fadd854098cf14ebe92f4d307a36dd)

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

bitbake: utils.py: Check for duplicate dependency entries

explode_dep_versions is not able to have duplicate entries.  Previously
duplicate entries ended up with the last item being the one returned to
the caller.

We now detect a collision.  We do allow an empty item to have a comparison
added to it, or a duplicate with the same comparison without error.

When a collision is detected a ValueError exception is thrown.

Allowed:
   foo foo (= 1.12) foo

Invalid:
   foo (= 1.12) foo (= 1.13)

(Bitbake rev: d40448f0483a2959e9dcaac9b6dd35839f396a6e)

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

classes: Update to use corrected bb.utils.explode_dep_versions2 API

The bb.utils.explode_dep_versions function has issues where dependency information
can be lost. The API doesn't support maintaining the correct information so this
changes to use a new function which correctly handles the data.

This patch also fixes various points in the code to ensure that we do not have any
duplicates in things that use explode_dep_versions.

A new sanity test to test the contents of the R* variables is also added.

[Some changes from Mark Hatle <mark.hatle@windriver.com>]

(From OE-Core rev: 16a892431d0c0d03f8b561b92909cf2f11af4918)

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

insane.bbclass: Remove copy and paste confusion when using OVERRIDES

People keep copying this code and its confusing and unnecessary. Remove the
bad examples to try and stop this happening.

(From OE-Core rev: 48aa4b00cfb7f01195c6d20b7ba660715fe792ef)

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

sanity.conf: Require bitbake 1.16.0 (stable series) prior to release (and for explode_dep_versions changes)

(From OE-Core rev: bf334f01cb90483ba304b4a830d53e705637b87a)

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

gdk-pixbuf: Ensure gdk-pixbuf-native dependencies are correct with linuxstdbase

Without this change, anything using linuxstdbase would incorrectly
try and pull in X dependencies.

(From OE-Core rev: 664fce61c9c49276039b18606e1e88585b47f724)

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

opkg: Don't call sync() when installing into an offline root

Even when installing onto a live target system, calling sync() during
package installation is of somewhat questionable benefit.  But calling
it on the build host during rootfs construction is certainly useless and
can cause I/O to stall for several seconds on even a moderately sized
host which is clearly not desirable.

(From a patch originally by Mike Crowe.)

(From OE-Core rev: f48a68177510e8f2d4fcc3725a6dfc41a9a8e96b)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

opkg: fix version constraints in conflicts, depends, replaces

* http://code.google.com/p/opkg/issues/detail?id=94

(From OE-Core rev: 7ebce895a215b31cf01aea2ac43e554f96ef814f)

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

package_deb/ipk: Remap < and > to << and >>

In deb and ipk, < means <=, while > means >=... there is a different
operator << and >> that means < and >, so we map them when constructing
the packages.

(From OE-Core rev: bbcc78d8ff03725ce5b3b65ce24025c3da45f2ab)

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

multilib: Move redefinition of STAGING_DIR_KERNEL

If the STAGING_DIR_KERNEL is set in the multilib.conf, then it may be
set incorrected.  The evaluation happens before TMPDIR and LIBC are
defined in other components.

Moving the definition process to the multilib.bbclass ensures that
everything has been loaded before it is set.

(From OE-Core rev: 6bd87edc383b40e300b0ef4bf851c39b698305cd)

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

Cleanup: fix PN == BPN cases

When building target packages, it used to be enought to check for PN == BPN, however
with the multilib configurations, this can lead to subtle errors.  Change instances
of PN == BPN, to ${CLASSOVERRIDE} == 'class-target'.

(From OE-Core rev: acc988272b4e74a9ad1e6da5af5b2d208584197b)

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

rpm: Implement workaround for DB_BUFFER_SMALL error

In certain cases with BerkleyDB 5.3.x we are getting the error:

db3.c:1443: dbcursor->pget(-30999): BDB0063 DB_BUFFER_SMALL: User memory too small fo

See https://bugs.launchpad.net/rpm/+bug/934420 for more information.

It appears to be some type of a bug in the BerkleyDB 5.3.x.  In an attempt
to workaround the problem, when we encounter this situation we attempt
to adjust the size of the mmap buffer until the call works, or we
end up trying 10 times.  The new size is either the updated vp->size
from the failed pget call, or the previous size + 1024.

If DBI debugging is enabled, additional diagnostics are printed, otherwise
a basic retry and success message is added to show that the failure was
resolved.

(From OE-Core rev: bfb2906206158748d0be33baf7984cf885756da1)

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

rpm: Add rpm patch to fix git_strerror issues

Remove the optimzation append from recipe and add the patch that is in the rpm
cvs repo, http://www.mail-archive.com/rpm-cvs@rpm5.org/msg08907.html. The -O2
optimzation append is removed since it can limit debugging options that are
provided when -O0 is used.

This was tested by setting: SELECTED_OPTIMIZATION = "-O0"

(From OE-Core rev: d109c6bd163469d6281d20174e4b79cb63483cd4)

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

rpm: Fix file contention issue

There is an issue that is caused when doing the install step of rpm on systems
with high parallelization where two jobs of make will fight for the same file
while installing the sub-directory lua. This is caused by the same makefile rule
being called twice in a way that both could be trying to install at the same
time.

This fix renames the linking rule so it will always be run after the needed
files are added and removed it's dependency so the required rule would only
run once.

This was tested heavily using ppss to run mutliple installs in parallel. This
wouldn't happen in practise but it was tested will all the individual rules as
well.

(From OE-Core rev: d05c5da6b972db97d3eb66b659f5641368c9ebe4)

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

rpm-native: Fix 'uuid_rc_t' undeclared error when compiling

When attempting to build with uuid and all tests compiling will error because
uuid.h doesn't exist in the rpm tarball. Fix this by changing the include to
use the one in ossp which solves the issue.

The recipe already depends on ossp so ossp/uuid.h will be there when rpm-native
is built.

(From OE-Core rev: 52ae2c2439bcb78323f61a3666e9b630b3a40b15)

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

libxcb: Update DEPENDS to avoid duplicate entries

Some items were listed multiple times in DEPENDS, avoid this situation.

Note, PR was not incremented as no change to the build process occurs.

(From OE-Core rev: e234af467eac7d0313fae3e87eb1b34725309bb5)

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

gst-ffmpeg: add LICENSE_FLAGS

This likely requires some form of license to use in a commercial
product.

(From OE-Core rev: 1d41af288f3db07a5dc47436443daf95e243904f)

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

yocto-bsp: remove 'test' options from user-config.cfg

A couple bsp templates have some options that were used for testing
but aren't needed for any other reason - remove them.

(From meta-yocto rev: dd3bbd04919f7cc69141f405ac95d736abddd637)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

yocto-bsp: use FILESEXTRAPATHS for xserver-xf86-config bbappends

The xserver-xf86-config .bbappends are still using FILESPATH - update
them to use FILESEXTRAPATHS as recommended by the Poky Reference
Manual and BSP Developer's Guides.

(From meta-yocto rev: 6aaef8eb9e95a46ab02ef038ae53c8e63eb04e09)

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

bitbake: Fix bad merge of #2162

This patch fixes the bad merge of #2162 fixes on master.

(Bitbake rev: 5b84d88f2a47063197f9a20f8ebf0a7ccf22c2eb)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob: Error reports are done in a clearer way

For long errors (bigger than 200 letters),
the text box is scrollable and resizable
and text is selectable.

Additionaly, all message dialogs are modal.
Otherwise, a user could still interact with hob
even in an error case, leading to potential problems.

See design details in related bugs.

Fixes [YOCTO #2960], [YOCTO #2983]

(Bitbake rev: be8bf02f2b347edf5514cafc6cb6a44f71118736)

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

bitbake: hob/builddetailspage: fix failure_primary_action_button_clicked_cb

[YOCTO #3194]

(Bitbake rev: 660a449bdfd154fed556024f166e69c6931ff634)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake: hob/builddetailspage: remove "back" button

When a build fails, there should not be a back button on the screen.
All available actions are provided within the failure notification,
so no back button is needed.

[YOCTO #3104]
(Bitbake rev: 03f978d21c7bfbf5f1afc741a43766030f2882a8)

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

yocto-bsp: fix dmaengine feature inclusion

The cfg/dmaengine/dmaengine feature changed location to cfg/dmaengine
in the 3.4 yocto kernel's meta branch.  Add template code to include
the appropriate version.

(From meta-yocto rev: b650fcb7781e1c6af6254c98ae64d5ea81b46abc)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

yocto-bsp: make vfat feature inclusion conditional on kernel version

The linux-yocto-3.2 cfg/vfat feature changed location to cfg/fs/vfat
in the 3.4 yocto kernel's meta branch.  Add template code to include
the appropriate version depending on kernel version.

Fixes [YOCTO #3178].

(From meta-yocto rev: d574c56c51789ec56ff50518ac2057607740eaa8)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

xserver-xorg: Remove RCONFLICTS against xserver-xorg

When merging the xserver-xorg fix the to use RDEPENDS in
xserver-xorg-module-exa the RCONFLICTS has not been removed by
mistake. This drops the RCONFLICTS to properly fix it.

(From OE-Core rev: d83e218dc480a09befddf8b934d774519cdbacb5)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

siteconfig: Clear cache before rebuilding

This ensures consistent build results and avoids build failures when compiler flags
change for example.

(From OE-Core rev: a5ff8396cad130f809f8f8da49bb38e6f80f923c)

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

perl: Fix substitution madness

We're going around in circles trying to fix the sed expressions and making one case
work and others not work. This patch fixes the base configuration file so we have
non-overlapping substitutions. I've tried to significantly clean up various problems
that were occurring once and for all.

This will hopefully resolve all the issues people have been seeing with incorrect perl
paths.

(From OE-Core rev: 31ff70794ecc431431476f81c8934fff25383613)

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

flac_1.2.1.bb: use TUNE_FEATURES to enable/disable altivec

(From OE-Core rev: bbcc66dc2d69821adb5b39b3642c368fb74ad4d7)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tune-ppce6500.inc: add e6500 tune files

Also supports a new altivec TUNE_FEATURE

(From OE-Core rev: 4586c24ad156773568cd38794936b8af62e862be)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

arch-powerpc.inc: add altivec as a valid tune feature

(From OE-Core rev: 026f8bc59b6c4cc23cc8a706117bf5b3555f2c7a)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

eglibc_2.16.bb: refresh fsl-ppc-no-fsqrt.patch for Freescale targets

(From OE-Core rev: 5635cf21520182e12c8a130707f8b47b5b4bec00)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

eglibc_2.16.bb: refresh ppc_slow_ieee754_sqrt.patch for Freescale targets

Make same changes for e6500 fpu as done with others

(From OE-Core rev: a39f8c19d0ea5dc92271cbe36a03d638cb806e04)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

eglibc_2.16.bb: refresh ppc-sqrt_finite.patch for Freescale targets

(From OE-Core rev: eba4de86e7e628690232f2f7912b321a9e22701b)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

eglibc_2.16.bb: replace patch with updated version that supports e6500

(From OE-Core rev: a68536b75cf93beaa1578b33d489d9f30b58ba2e)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

boost: Support enums in hash

Fixes builds which were building fine with previous versions of boost

(From OE-Core rev: 139b65affbf50c4230e344cd4d0205ef025bb7c3)

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