scripts/combo-layer: fix overzealous regex in default hook script

combo-layer's hook scripts are intended to modify patches as they pass
through; the default one adds a prefix with the component name and
a line with the component repo revision before the Signed-off-by;
however the script was also unintentionally modifying the contents of
patches *within* the patches passing through it, which resulted in
unexpected failures when the combo-layer script attempted to use
"git am" to apply them.

(From OE-Core rev: e7aae45414e4597e9244f86a81fbc940f73785c8)

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

base.bbclass: clarify COMMERCIAL_LICENSE skip reason

Change to a proper sentence and add a reference to the
COMMERCIAL_LICENSE variable so that the user knows where this can be
controlled.

Addresses remainder of [YOCTO #846]

(From OE-Core rev: 463d1719cc627ef22089282acfe70d7fcb835419)

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

utils.bbclass: skip empty paths when handling FILESEXTRAPATHS

* if there is multiple .bbappend files with FILESEXTRAPATHS_prepend := "/:"
  then the one parsed last is causing trailing ':' and that's causing empty element in
  path = extrapaths.split(:) + path
* it's hard to keep all .bbappends from foreign layers to follow this rule, so it's better
  to be able to handle trailing ':'

(From OE-Core rev: 3b5591d423324da076d038ad335af47b616a7903)

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

task-core-x11-sato: add libsdl into sato image

We add libsdl into sato image since some 3D graphics testing needs it.

(From OE-Core rev: 0934dc7c421ea6fb8f16ce535be72dda9ecb17de)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libsdl: do not inherit nativesdk

We already enable target version for libsdl and use BBCLASSEXTEND
to enable nativesdk. No need to inherit nativesdk then.

(From OE-Core rev: f3945cf1a9d33438afbcb28ee35edc10b9d047d9)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

scripts/combo-layer: fix configuration file handling

(From OE-Core rev: e83017fe9e1dc89860a43d41d0480d1371539e44)

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

scripts/runqemu: add support to pass bootparams to kernel

(From OE-Core rev: 4a2d3cfeeef4de6da1301c65033fa251538cddc9)

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

kernel.bbclass: save kernel image name into $kerneldir

Save the kernel image name into sysroot so it can be used during image
build if need. This is used by O.S. Systems products and probably
useful to others.

(From OE-Core rev: 19a587cb98a20f0e659483541fc8cec874f6afa9)

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

Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION

(From OE-Core rev: 6890c02ec4538b82b694deaba39e9921af4e3f47)

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

bitbake meta-toolchain with gcc 4.5.1 failed

Fixes bug [YOCTO #1386]

1) Add the following lines to conf/local.conf:

SDKGCCVERSION="4.5.1"
GCCVERSION="4.5.1"

2) bitbake meta-toolchain

The we will notice the error that sed can't find the directory:

${TMPDIR}/work-shared/gcc-${PV}/gcc-${PV}-${PR}

we had changed the name of S from gcc-${PV} to gcc-${PV}-${PR}, but didn't
update meta/recipes-devtools/gcc/gcc-common.inc, so fix S in gcc-common.inc
would make it work.

(From OE-Core rev: 282773ff3e0f365c08ae7e8fe759029f33e575b1)

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

linux-yocto: update SRCREVs for 3.0.3

Updating the SRCREVs to pickup the kernel.org -stable update for
3.0.3

(From OE-Core rev: 450b6eded024c365d0ad4808b492d73c4cd02f6d)

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

linux-yocto: move more default values into linux-yocto.inc

During the preparation of some linux-yocto extension documentation it
was clear that some variables are being defined in each recipe, when
they don't have to be. Moving the defaults into linux-yocto.in and
allowing them to be overidden in recipes simpifies the reuse of the
base infrastructure.

(From OE-Core rev: 0ca26544efe8d650f36db9dc1c3b3a15110d7e31)

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

at: fix RDEPENDS -> RDEPENDS_${PN}

(From OE-Core rev: 848f198563bc31e591a559936e9c679c7381c9a6)

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

adt-installer: Removed the hard coded repo url.

[YOCTO #1380] Removed the hard coded repo url in opkg configuration
files.

(From OE-Core rev: 125eae393a3448e1ff5f3c2cf782ed7b3aa23920)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

image_types_uboot: add uboot mkimage fs types

(From OE-Core rev: ac75c4cc27494e93ad8eba318582b875fea8f508)

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

rpm: be certain we don't prefix our binaries

In certain combinations of build/host/target, they can end up
inadvertently prefixed, breaking the assumptions in the recipe.

(From OE-Core rev: a00600b853570b6090e68d20f22bb5ef5435e0ea)

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

libpcre: the generated libtool uses HOST_SYS

(From OE-Core rev: 039b1a04db32bed23536a23983c3b6d91e1166c7)

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

recipes: Delete patch=1, its default and replace pnum with striplevel

Some place pnum=1 is used which is removed as well since
striplevel=1 is default

(From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386)

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

tune: Add hard floating point variants of cortexa8 tunes

Enable machines or distros to select the hard floating point abi for cortexa8
machines. I left out the arm7a thumb+neon combinations as they were not
present in the original non-hf set.

(From OE-Core rev: c70ebd6f8ff34071febeb132c8bc4df220e328da)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Jason Kridner <jkridner@beagleboard.org>
CC: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tune: add missing closing quote to arch-armv7a.inc for AVAILTUNES

A closing quote was missing for an AVAILTUNES append operation, add it.

(From OE-Core rev: 7d46901840795638ff184a43e65299446fbd0b4e)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Jason Kridner <jkridner@beagleboard.org>
CC: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

usermanual: The git fetcher defaults to the git protocol (or file)

(Bitbake rev: 692c2fcead5c82249359ad54d2c7941d087a2eb3)

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

fetch2/git: Add rsync as a valid git protocol

(Bitbake rev: 4cc4e318fd6907a4742f327177f321d140385c9e)

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

bb/ui/hob: warn and prevent image build if no IMAGE_FSTYPE is set

If IMAGE_FSTYPE is empty and the user has opted to build an image warn
them and prevent the build.

Fixes [YOCTO #1267]

(Bitbake rev: 023edbe6d04f25c7e0e7b615eb06cd3727c665cb)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/hobprefs: fix setting IMAGE_FSYTPES

We were setting the value as a list when a string is expected

(Bitbake rev: fc3bb3a4f04f64c6d47c7bf040b7522e9204a458)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/hobeventhandler: fix return values of *_image_output_type

These methods are expected to return lists.

(Bitbake rev: 4e101de9034c20dfda0bb851e84f4315335620f6)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/hob: fix package only build

Use the models new get_selected_pn method to return a list of PN's for the
selected items and pass that for a package only build, rather than passing
a list of package names (which buildTargets can't handle).

Fixes [YOCTO #1385]

(Bitbake rev: c969857c7f5963098e6584803eafb4e2be0eea46)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/tasklistmodel: track the PN for each entry in the model

Now that we've switched to packages in the model, rather than PN, it makes
sense to add an extra field to store the PN of the package.

This patch includes a convenience method to retrieve a list of selected PN's.

(Bitbake rev: cf79424592a81378de5edad11cf6c4f427c94bcc)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

hob: don't try and build if user selects Bake with no selections made

If the user hasn't made any selections inform them that they need to do so
before clicking Bake.

Fixes [YOCTO #1384]

(Bitbake rev: e176dcf637da2d0105a4361a46d5df5238e3b8ce)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/tasklistmodel: store all binb, not just the first

This makes it easier for the user to determine what the effects of a
removal may be, further it means we no longer need the find_alt_dependency
method which could be a fairly time-consuming method depending on the size
of the contents table.

Partially addresses [YOCTO #1365]

(Bitbake rev: 91d1f5f5a44c80e6702221509e2e9aadbe05bcc0)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/tasklistmodel: remove useless items from dependency list

Ensure the dependency list is uniquified, doesn't include self references
and further doesn't include -dev references.

(Bitbake rev: 70aebebc3867d52e460355667e711c7c6dcd50ce)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/tasklistmodel: more robust checking for substrings

Relying on the count() method of Str to determine whether the string
contains a substring is error prone purely because the return value doesn't
strictly convert to a Boolean value.
To that end take the more pythonic approach of using the in operator (foo
in bar) to check for the substring.
Further, add a helper method for the common case of testing whether a pn
is -native, -cross or virtual/

(Bitbake rev: d7768cefcddd59a5102d7e9b67e4416bf8603f55)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/runningbuild: hide the progress bar on cache load complete

When we receive the CacheLoadComplete command we need to ensure the
progress bar is hidden as we can't expect the ParseComplete event, where
this would usually be done.

This patch makes the Goggle UI usable again.

(Bitbake rev: 64dfc574c12d882761e4958c8b1881cd47a87e0d)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb/ui/crumbs/runningbuild: reduce number of messages after recent msg change

The recent change to the message module to remove custom logging domains
resulted in an increased number of messages being displayed in the
running build view, ignore all messages lower than log level INFO.

(Bitbake rev: a12da000a8e4138fbdfd77f9c49b11fc69a315e1)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world builds

(From OE-Core rev: 9134800548a03bfe3a7e351a15f2129bcb3cc680)

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

bluez4: drop usbpath from DEPENDS

We don't (currently) have usbpath in oe-core, so drop it from the DEPENDS to
make BlueZ buildable again.

(From OE-Core rev: 919714837116097483fa3f475d2e1ad3b18961d1)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
CC: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libgcc: Remove fetch/unpack/patch noexec stamps

libgcc now uses shared work directories so we cannot mark
these tasks as noexec. If we do, the tasks may not run
and hence gcc may not get patched for example which
results in failures.

This patch simple removes the flags since they're unneeded.

(From OE-Core rev: e2c03b2a80efeeea2298bdba385671d0ae208e95)

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

newt: update distro tracking fields

Update newt distro tracking fields

(From OE-Core rev: c539155c51e43680711130df9050d3e92282591e)

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

alsa-tools: update license and add distro tracking fields

Update license and other informations, then bump up PR.
Update distro tracking fields.

(From OE-Core rev: b989bb90919eb28cb92e842e989aa5b1fd7f068c)

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

slang: add homepage and update distro tracking fields

Add slang homepage and bump up PR.
Update distro tracking fields.

(From OE-Core rev: 86c9732728e2e29051d6e6059e19c015c06358cb)

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

mailx: update license and distro tracking fileds

update mailx license and bump up PR, and update distro tracking fields.

(From OE-Core rev: 290d51e9c8884886995b8adbafe4aa5eb5f879bf)

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

eglibc: check dependencies among eglibc options

Fixes [Yocto #1212]

'libc-inet' and 'ipv4' are the same thing, so remove 'libc-inet'
from the default DISTRO_FEATURES_LIBC in file default-distrovars.inc.

Check the dependencies among eglibc configurable options, make sure
that eglibc could be compile successfully only with part of the options.

(From OE-Core rev: 4b8d13b72c2c338ec5606f19aa5d7554558c51e5)

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

acl: Use BPN instead of PN for style like lib${PN}

When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.

(From OE-Core rev: 58c66c0ef6f9233a308362f0aad36a753206770c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

attr: Use BPN instead of PN for style like lib${PN}

When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.

(From OE-Core rev: 4bb32686a727e0458f091a34800345938fb56606)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

ea-acl: Use BPN instead of PN for style like lib${PN}

When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.

(From OE-Core rev: 2768b3b26d392d988d392c80e52e1f5e9da23c5c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

curl: Use BPN instead of PN for style like lib${PN}

When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.

(From OE-Core rev: 618de3f788a22127def8244c0d6ebd3608ed5577)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

initrdscripts: fix init-live.sh

Fix bug: [YOCTO #686]
Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to
run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img".
If we want to use liveCD, we also need to add some kernel options related to
CDROM support when compling kernel.

(From OE-Core rev: f9b6f41c9249cc90f7621d446eafae5e5508dd6e)

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bluez4: update recipe from meta-oe

* fix DEPENDS
* fix typo in --enable-pandd option
* remove unsupported options
* update packaging
* remove distro override which doesn't belong to oe-core

(From OE-Core rev: dd678881dfd8626299ee3b68284d2f41f07c1c56)

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

task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager

(From OE-Core rev: 6a38215b5214de2da82232f05ed1d29d3c422b3c)

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

gdb: Add lttng-ust to DEPENDS only for eglibc

(From OE-Core rev: 689c906a9c47b08f9597787c4158e203135787bb)

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

task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust

This helps build on uclibc where lttng-ust is not included

(From OE-Core rev: 6baf17f1604853a1770c14cdc6ee0493beab6829)

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

at: make at usable for common user

Fixes [Yocto #1297]

The pkg_postinst was added to fix Yocto #675. But it seems not needed
any more. Remove it then unprivilege user could use at.

(From OE-Core rev: dec5dfa334ce1b2524f80fab3d3f37e476f54a9f)

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

libxslt: fix packaging of static libraries

This prevents warnings about .a files being installed but not shipped.

(From OE-Core rev: 187302dcc1536469a01c6ebd433eda4a4c2c411a)

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

scripts/runqemu: modify search paths for libgl

On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

(From OE-Core rev: 66e34066a0ac71f4212824b1e6353a4d323f4e21)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qemu: modify search paths for libgl

On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so.
Use a wildcard to match different locations, as uname -i only return unknown on Debian.

(From OE-Core rev: 32f74152dfe583f005c8654910b15cd7d0e3d421)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

sysvinit: Change ${PN} to ${BPN} in file names

Some files in sysvinit are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.

(From OE-Core rev: c7bcf6e7c851269178af99ed9096207ab14fe76c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: Change ${PN} to ${BPN} in file names

Some files in busybox are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.

(From OE-Core rev: d6c24d3944ed662591372fbd7bf855395655d634)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

perl-native: Update find_perl to find the perl wrapper

[YOCTO #1157] [YOCTO #829]

This is a common issue to the packages which using 'MakeMaker.pm' to
generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm'
will be used to figure out the path/link of 'PERL/FULLPERL', but it
always find the 'perl.real' instead of perl wrapper.

Just update it to find the perl wrapper correctly.

(From OE-Core rev: f1d4fb02d9952138acab6d647ce8975363dfdbab)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

glib-2.0: explicitly disable dtrace and systemtap for native varaint

This prevents systemtap and dtrace being picked up from the host as
reported on the Yocto mailing list by Andre Haupt <andre@bitwigglers.org>

(From OE-Core rev: 0d883b5df25635fbad45191d297cbdf78a6c1fe0)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qt4: allow a reduction in build time

When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.

* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()

(From OE-Core rev: 51ef8335df895603e75345a18aaefe2359b2387f)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

sanity.bbclass: add optional untested host distro warning

SANITY_TESTED_DISTROS, if specified, is expected to be a
newline-delimited list of distro identifier strings, e.g.

SANITY_TESTED_DISTROS = " \
        Ubuntu 11.04 \
        Fedora release 14 (Laughlin) \
        "

(spaces, tabs etc. are trimmed)

If SANITY_TESTED_DISTROS is defined, we will attempt to detect the host
distribution. If the distribution is not in SANITY_TESTED_DISTROS or we
could not detect the distribution then we show a warning during sanity
checking.

Provides the mechanism for fixing [YOCTO #1096].

(From OE-Core rev: 75e3875341ddc8940e9ee2ccbbb2ec18194a68e6)

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

image.bbclass, kernel.bbclass: create warning file about deleting deploydir files

New users sometimes delete files in tmp/deploy/images assuming they will
be re-created just by re-running the build, and then are confused when
this doesn't work. To discourage people from doing this, create a file
called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in
tmp/deploy/images containing an explanation of what needs to be done to
re-create files there.

Fixes [YOCTO #1315] and [YOCTO #1346].

(From OE-Core rev: 4316c5e9eec67d71f4699102a63a5f968bd8d1d9)

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

kernel: restore crtsavres.o to enable building external modules on powerpc

Fixes [YOCTO #1276]

As of Linux kernel version 3.0.1, and much earlier, the make clean target
removes arch/powerpc/lib/crtsavres.o. As this object is present in
KBUILD_LDFLAGS_MODULE, it is required to build external modules, and should
therefor not be removed by make clean.

While I do not advocate fixing buggy kernels in the generic kernel classes,
we should probably account for this one in kernel.bbclass as it affects
such a long list of kernel versions.

(From OE-Core rev: 2e83e6755441cb14bd907d306974338c15173189)

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

shadow: switch to a fetchable SRC_URI

Swith the SRC_URI to the one referenced on the sources section of the
utilities download page (http://pkg-shadow.alioth.debian.org/download.php).

(From OE-Core rev: c8cdfcd2fe06593d8523b94c33920a607429004a)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

buildstats.bbclass: Fixing task endtime

Task endtime got left out of recent changes. Adding it back in.

(From OE-Core rev: f1e4b049438218347922f13de810782be0205c3d)

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

ofono: conditionally enable bluetooth

Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth.

(From OE-Core rev: 4024bf2874e9da4fd0dd9a2b90a48e8a259781cc)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

create-pull-request: increase likelihood of detecting a rename

Decrease the similarity percentage needed to recognize a delete/add-pair followed by an edit,
as a rename.
This make reviewing patches easier.

(From OE-Core rev: 3944f5e02d22b70b3bcd733a80f005dbd8e248a2)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

connman: use DISTRO_FEATURES to enable wifi and bluetooth

As wifi and bluetooth is set in DISTRO_FEATURES, connman should respect this during configuring.

(From OE-Core rev: 869a1efee685d59c762b965b98ac9c247be68c29)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qmake_base: add uclibceabi

Partial sync of qmake_base from meta-oe.
* Add a matching rule for *linux-uclibceabi-oe-g++, to make qmake_base.bbclase more
similar to the version in meta-oe.

(From OE-Core rev: 2a1fa5b3f1424e9264d29027c589b55cf2feb109)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

distro_tracking_fields.inc: update the info for the following recipes

cronie
mdadm
freetype
xproto
glproto
dri2proto
util-macros

(From OE-Core rev: 4abc11e6b61d9b26d1b4ebc6c249467a47c5de07)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

dri2proto: upgrade from 2.4 to 2.6

The patch has been integrated into 1.4.14 so let's remove it.

(From OE-Core rev: 8e0e309966576d705c75eb0e82cbf46e57fc0e46)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

glproto: upgrade from 1.4.13 to 1.4.14

The patch has been integrated into 1.4.14 so let's remove it.

(From OE-Core rev: 6f66bab6bf9fa202bfbbaed5d86c0d585e23571e)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

xproto: upgrade from 7.0.21 to 7.0.22

(From OE-Core rev: 8f80adf492226af775487e9224d4892a5f9c72a3)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

freetype: upgrade from 2.4.4 to 2.4.6

freetype-2.4.6/docs/LICENSE.TXT changed a little to describe more clearly
the compatibility about FreeTypeLicense and GPLv2+, but the actual license
remains unchanged: it's still  LICENSE = "FreeTypeLicense | GPLv2+".

(From OE-Core rev: 06e0d50a936c01d4f02e7208b7e3784947436462)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

util-macros: upgrade from 1.14.0 to the latest version 0.15.0

(From OE-Core rev: c8289590ac4b60d1bec5397585c9ceb3d2982ae1)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

mdadm: upgrade mdadm from 3.2.1 to 3.2.2

Remove the patch since 3.2.2 has integrated it.

(From OE-Core rev: a39c0c022090ba078ba6132ff69f9587fea592be)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

cronie: upgrade from 1.4.7 to 1.4.8

(From OE-Core rev: 42ee402fc4ecee9349c1e7ce31c55275f34b121e)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tcf-agent: add openssl into DEPENDS

[YOCTO #1330]

If tcf-agent's do_compile happens before openssl does populate_root, we'll
get such a compilation failure:
framework/channel_tcp.c:34:27: fatal error: openssl/ssl.h: No such file or directory

Thanks Kumar Gala for reporting this!

(From OE-Core rev: 9314d5844a16812bb66e8c9c471ee9fd70a574c2)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bluez-hcidump: upgrade from 2.0 to 2.1

[YOCTO #1371]

Recently bluez4 was updated from 4.82 to 4.96 and bluez-hcidump can't build:
src/hcidump.c:54:24: error: redefinition of 'ntoh64'.

In 2.1 the duplicated definition of ntoh64 was removed.

(From OE-Core rev: 15a369b4e65fc8068ba7fec70ec24b7c23e7950b)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHS

[YOCTO #1345]
The new variable ALL_MULTILIB_PACKAGE_ARCHS contains all the values of
PACKAGE_ARCHS for each multilib variants. The opkg backend now uses this
new value insteald of the PACKAGE_ARCHS to update the opkg indexes and
to generate the opkg configuration files. This allows the normal
packages and multilib packages may be installed into the same rootfs.

(From OE-Core rev: b774bf44ef004276da12a83ebd69715c00b596ac)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

linux-yocto: meta SRCREV bump

Bumping the linux-yocto meta SRCREV to pickup new target
configurations and features.

(From OE-Core rev: 110ca8dcaee263bc3c8380bcb91f6ada20655c14)

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

qemu: change default kernel to 3.0.x

The explicit setting of version preference to 2.6.37 is
no longer required. All of the qemu targets have been built
and boot tested on 3.0.1 for core-image-minimal and core-image-sato
and are safe for wider build/boot testing.

(From OE-Core rev: 14831b6ba26a6e43a1771a8516d0af145006c504)

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

linux-yocto: bump version string to 3.0.1

There was some confusion around the 3.0 version string in the
linux-yocto recipe when the merged version was 3.0.1. Bumping
the version string should clarify what version will be fetched.

(From OE-Core rev: 29017755329ff1ad740fe094a4a89057e9c2a48d)

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

gtk-icon-cache: Adding MLPREFIX when dynamically set RDEPENDS

When dynamically setting RDEPENDS, we need to add MLPREFIX to adapt
multilib case.

[YOCTO #1368]

(From OE-Core rev: 2ed808b764f023c074fa3aabef18b4f874cd82c7)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package_rpm: Fix package rename issue in multilib case

do_package task will write information into pkgdata and
do_package_write_rpm will read them out. Take lib32-dates as an example,
one of its RDEPENDS is li32-gtk+, and PKG_lib32-gtk+ = "libgtk-2.0",
these info is stored at:
tmp/pkgdata/x86_64-pokymllib32-linux/runtime/lib32-dates.

Function "mapping_rename_hook" in do_package_write_rpm is to handle
those renamed packages. However before it executes, translate_vers
has stripped the multilib prefix out, making it failed to find PKG_gtk+
value in pkgdata.

This commit moves the strip_multilib out of translate_vers and call it
after "mapping_rename_hook".

[YOCTO #1368]

CC: Mark Hatle <mark.hatle@windriver.com>
(From OE-Core rev: 216a1cfe7973e99e3e79585040e91f7a6e298884)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package_rpm: enhance strip_multilib function

The previous logic could only strip MLPREFIX from the first element in
an array, take an example, strip_multilib the [lib32-a lib32-b lib32-c]
will result in [a lib32-b lib32-c]. We need to strip prefix one by one.

This commit change the logic to strip all elements' multilib prefix.

[YOCTO #1368]

CC: Mark Hatle <mark.hatle@windriver.com>
(From OE-Core rev: ca729de4b261e4feba74fdf0b2578890bc80ea90)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

rootfs_rpm: Fix DEFAULTTUNE setting in multilib case

"virtclass-multilib" is set to OVERRIDES in multilib.bbclass, remove the
duplicated settings here.

Besides, DEFAULTTUNE has overrided and it can be directly used.

[YOCTO #1368]

CC: Mark Hatle <mark.hatle@windriver.com>
(From OE-Core rev: dc78cdb318671862c5cd15711364c1c4462d9ece)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qemu: Make qemu buildable inside qemux86/qemuppc target

It requires libx11 and libGL(if enabled GL) for building, which introduce extra
dependence in qemuppc target. Futhermore, qemu's GL code is x86-oriented, thus
some hacks needed for building in qemupcc. For simplicity, just make qemu GL's
code for native only, so that qemu building is okay in world build.

[YOCTO #1011] got fixed.

(From OE-Core rev: e744d4e2d33d914b2ca31be2d4eadab9fbcc3251)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxcb: enable native/nativesdk builds as was done previously in meta-oe

(From OE-Core rev: 552fc421b54303fbaad57b4596350e1bc4ed6674)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libproxy: remove dependency on X libs

Nothing in the source refers to libX11 or libXmu so there would appear to be
no good reason for them to be in DEPENDS.  It looks as though these are perhaps
a relic from an earlier version which did need those libraries.

(From OE-Core rev: 5d0b45c982b92eecde48cc10dd095927fa38a047)

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

cmake.bbclass, perlnative.bbclass: arrange for cmake to find perl-native

When CMake is looking for perl, it only searches in the specific directories
that it's told about and ignores ${PATH}.  If perlnative is in use, ensure
that the appropriate installation path is added to the list of places that
cmake will look for perl, otherwise it won't ever be found.

(From OE-Core rev: add9e4e30e0b1e0f93479b43ce61953efb90985d)

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

Fixup remaining bb.msg.domain users

(Bitbake rev: d5abdacaf9ac604ef8d8c1bafb9b30617827cb4f)

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

distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade.

(From OE-Core rev: 13db5f420ca9bff98561f80d78958278734ad1f4)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libx11-diet: Fix bug 1050

[YOCTO #1050]
I got do_compile failure during building qemux86 image
| ../../../doltlibtool: line 17:
/distro/dcui/0704/pc1/build/tmp/work/i586-poky-linux/libx11-diet-1.3-r2/libX11-1.3/modules/im/ximcp/../../../libtool:
No such file or directory

This is due to not found libtool, but i586-poky-linux-libtool in libX11-1.3
So I disable dolt for solving this problem.

(From OE-Core rev: 710ad20f005cb96a6aabf3f0eb184a254ada1610)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

The Skeleton initscript doesn't work on minimal image

Fixes bug [YOCTO #1165]

The /etc/init.d/skeleton doesn't work on minimal image, this is
because of the pidofproc doesn't return "$?" correctly, so store
$? in the variable status would fix it.

(From OE-Core rev: 4d31193a6969df25bb85a9862b7295e85dcec04b)

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

qt4.inc: expand the package name for multilib case

in the qt4.inc python annomyous code, there is case where package name
is set to "${QT_BASE_LIB}-tool", and  FILE_${QT_BASE_LIB}-tool is set to xxx.
here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to
FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no
FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined.

to fix this issue, this patch expand the QT_BASE_LIB when assigning the package
name.

FIX [YOCTO #1344]

(From OE-Core rev: b5d381133660fe338796b965131cee39cec01b96)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qt4.inc: revise RRECOMMENDS

using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free
case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist

this patch fix it by using ${PN}

(From OE-Core rev: d72adf3c4cf3de09d2a0bc6d1b9e7c9fd127bd60)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libsdl: enable opengl for libsdl

To enable opengl for libsdl, we need DEPENDS on virtual/libgl. Add a check for
"opengl" in DISTRO_FEATURES and when it's set, "--enable-video-opengl"
and "virtual/libgl" will be added into EXTRA_CONF and DEPENDS.

(From OE-Core rev: c28e62125209aa2e9606f094a4100ac1107fdd28)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libsdl: add target version

Rename libsdl-nativesdk to libsdl to enable target version. libsdl
is needed in some graphics testing.

(From OE-Core rev: 2d719f69676e9a64f7baf34f058441b887dfa14a)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

default-distrovars: add x11 to default DISTRO_FEATURES

(From OE-Core rev: 74f7e5c683dfd71c4042789b8dd4908f76f7e07a)

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

dbus: only use x11 if DISTRO_FEATURES has selected it

This makes it possible to include dbus in a non-X11-equipped DISTRO.

(From OE-Core rev: abf2ab7b4d6e9f615f86ba84e684ae0753c602a8)

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