cooker: add inherit information when generating package tree

Inherit information could be used to judge if a recipe is image type
or not.

(From Poky rev: 203f112a84b3971dc71da3dc455fd054d1c16a12)

(Bitbake rev: fe52af99918f61abec8f779efb02926b713f2aac)

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

Hob: Change the titles for recipe view and package view

(From Poky rev: cccbf0cc8a3d8c93a141d96bed4763beb7b85786)

(Bitbake rev: 98dd4f20f2e6f50c1cad2c480eebde14eeadc41a)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Change "View Packages" description

Change 'View Packages' button description from 'Add/remove packages' to 'Add/remove previously built packages to/from your image'.
And we adjust the size to make "View Packages" button fit into the window.

[Yocto #2146]

(From Poky rev: 279dbff3ef9f8e8bc58b86f8c4f5ffe70d4a2e8b)

(Bitbake rev: 594f5936c2450d596967f062c14434f5357cb5aa)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Change window title from HOB to Hob

[Yocto #2147]

(From Poky rev: 9291e6b751171a49fcd8cd0d13c6b22479e542bd)

(Bitbake rev: 6d9dc83e566b7d3a4903fdba30053233d97e8381)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Move "Create your own image" to the bottom of image list

Move "Create your own image" item to the bottom of base image list.
Besides, remove an un-used hob list entry.

This fixes [YOCTO #2104]

(From Poky rev: f215ce518ad644ca4747ae17279db4b82d0c715d)

(Bitbake rev: 7e00723a6508023ffbefed2c2de1bc9c55564faa)

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

Hob: Change package selection tab order

In the package screen, change the tab order to be:
"Included" and "All packages".

Also change some descriptions in tab.

This fixes [YOCTO #2111]

(From Poky rev: 25628f43d16bcc35874bdac3e1ce1b552c049633)

(Bitbake rev: e12a5e478635a0de87060ac20aff8c9b1858596e)

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

Hob: Change recipe selection tab order

In the recipe screen, change the tab order to be:
"Included", "All recipes", and "Tasks".

Also change some description name in tab.

This fixes [YOCTO #2110]

(From Poky rev: 400b1092f1bad578b26d1e41aeb87dcb852aa4e3)

(Bitbake rev: f7168e891ce4af5234d53896a7f51489a7c84a6f)

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

Hob: Change template button name from "Template" to "Templates"

Change the button name according to UI team's design.

This fixes [YOCTO #2126]

(From Poky rev: 1e4477f9b121b2523685cc6440050c47d3ae1cde)

(Bitbake rev: f75dde11f2d73119702026d4dd531c0b242303c7)

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

Hob: change package classes selection GUI

This commit change the GUI for package classes selection in advanced
setting dialog, which conforms with UI team's design.

(From Poky rev: 7bbcabdb71d76cdb2ec1de15618d1e47f1149a21)

(Bitbake rev: 4ebce01dde18e67e01ff7c4736c229a3364c04b0)

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

Hob: Remove split model in GTK Hob

Since the GTK Hob will not use the server/client split model, thus
remove it from current Hob code. But we still keep the core mechanism
in bitbake server.

(From Poky rev: 983ea0265a53e0725dcbf9085ea767ebbc155ae5)

(Bitbake rev: 8c129e05a94d457860d883c9b2934a5559de8d9b)

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

Hob: Still use initcmd != None as the if judgement

This commit reverts part of change in 491c87d1, since initcmd has a
possible value of 0, therefore we must explicitly compare the initcmd
with None in if judgement.

(From Poky rev: 5736972974a769ea7ce6c92fdf6842db044f770d)

(Bitbake rev: ee55ca82c94080ef825d6de094e38ba40ee62e8b)

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

xserver-kdrive: Fix packaging warnings

WARNING: For recipe xserver-kdrive, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/lib
WARNING:   /usr/lib/xorg
WARNING:   /usr/lib/xorg/protocol.txt
WARNING:   /usr/share/X11
WARNING:   /usr/share/X11/xkb
WARNING:   /usr/share/X11/xkb/compiled
WARNING:   /usr/share/X11/xkb/compiled/README.compiled
(From OE-Core rev: d036265de1d9931bedb660e01a763d3d1d9e4097)

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

readline: Fix RPATH Warnings for GPLv2

the norpath.patch with v2 and it worked correctly?
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libhistory.so.5.2 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libreadline.so.5.2 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libreadline.so.5 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/i586-poky-linux/readline-5.2-r7/packages-split/readline/usr/lib/libhistory.so.5 contains probably-redundant RPATH /usr/lib

(From OE-Core rev: 511a9e72f7deac4d31bad6c2d94117d9fd0b97f5)

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

lttng-ust: Increase PE due to incompatible version changes related to lttng-ust2

(From OE-Core rev: 732b9d6f3528c4c76be0afa911e7e1d5cf781c41)

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

Add bitbake-dumpsig to make it more obvious how to dump a signatures file

[YOCTO #2057]

(Bitbake rev: c5fdc6c02fe4712d3114caccfd759a626bd9677b)

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

gettext/awk/sed/grep: Backport WARNING fixes to GPLv2 versions

(From OE-Core rev: b60d0c57a2e16d690fd11c6349917efc57630004)

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

gzip/pigz-native: Install into a prefix to avoid clashing with system binaries

Due to the system providing a copy of gzip, we face some issues when we
'shadow' that copy with our own leading to a varient of race type bugs,
and issues for example if a dependency such as libz is missing but the
binary is still present. We usually rely on our dependency logic to protect
us from this but for gzip, we don't have this protection since its not listed
by all its users (and doing so would be impractical).

This patch installed pigz and gzip into their own directory which we only
add to PATH when we explictly want these binaries in much the same way we do
with perl-native. This means dependency logic is correct when we use the binary
and everything should work well.

The patch adds an explict dependency into image.bbclass since the accelerated
speed of compression is most appreciated at rootfs time.

(From OE-Core rev: 7a98c0ef28822ae1fcee45b14db3edcfd4c7ad8f)

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

bitbake.conf/sstate.bbclass: Change PATH when installing sstate files to avoid issues

This resolves issues related to pigz-native when installing from sstate that people
have been seeing. It also gives us a way to solve issues like the gzip-native race
during sstate package creation covered in Yocto #1774.

(From OE-Core rev: 518dffe20178f5969dddccb17d6ab347afb72beb)

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

buildhistory_analysis: avoid printing PE/PV/PR more than once

Don't print PE/PV/PR changes as related field changes of related field
changes (i.e. only print them once at the top level).

(From OE-Core rev: 33046605549501bed9ceff102614d86ba54a5891)

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

buildhistory_analysis: report if all items removed from a list

If all items have been removed from a list then state that explicitly.

(From OE-Core rev: 2434a751e9684058786d4595cef3678d397f3c39)

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

buildhistory_analysis: skip FILELIST changes for dbg packages

Don't report when files are added or removed from dbg packages unless
it results in the package being empty.

(From OE-Core rev: ee57a989188519dd40310cb5576cbff4b247ad95)

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

buildhistory_analysis: hide version number increases in dependencies

If an item in RDEPENDS or RRECOMMENDS only increases in its version
number then don't report it as a change, since we don't care about
it. This significantly reduces the noise after upgrades.

(From OE-Core rev: f72b2a1bda35a99292063c1cc6ff563b397e190d)

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

buildhistory_analysis: use bb.utils.explode_dep_versions

Previously this had its own implementation of splitting a list of
packages with optional version e.g. "libncurses-dev (>= 5.9)"; switch to
using the already existing bitbake function which does this as it is
much better tested.

(From OE-Core rev: de21a483063d9803c4ce1d62b03913ccad2931bd)

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

lttng-2.0/lttng-ust: Change recipe name to lttng2-ust.

Change the recipe name lttng-ust from lttng-2.0 to lttng2-ust so that
that both the lttng-ust of the old framework and of the new framework
lttng-2.0 can coexist.

Fixed bug [YOCTO #2062].

(From OE-Core rev: 0d9fc8185945328837aa1a3d9d705afa56856853)

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

parted: update to version 3.1

* Supports disks > 2TB

[RP:Add in missing delta of fixed in subsequent version]
(From OE-Core rev: daa6d80d902cb35af1b3f3f1e9e55cb944eb2de0)

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

syslinux: fix stripped file warnings

Fix the following package warnings:
WARNING: File '/usr/bin/memdiskfind' from syslinux was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/syslinux' from syslinux was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/gethostip' from syslinux was already stripped, this will prevent future debugging!
WARNING: File '/usr/bin/isohybrid' from syslinux was already stripped, this will prevent future debugging!

(From OE-Core rev: 90bf61226d1bebd846ad9dc028affc334862e794)

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

libacpi: fix stripped file warning

Fix the following package warning:
WARNING: File '/usr/bin/test-libacpi' from libacpi was already stripped, this will prevent future debugging!

(From OE-Core rev: 678b895fba610c71fcbb13555bf96322dcb15aea)

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

hdparm: fix stripped file warning

Fix the following package warning:
WARNING: File '/sbin/hdparm.hdparm' from hdparm was already stripped, this will prevent future debugging!

(From OE-Core rev: d2625ddfdee752ed790aa6b9a8b8ceade8358093)

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

distro_tracking: update openssl

(From OE-Core rev: 486c0abeaaf9e4467d3f72a24cc6956595c955f3)

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

openssl: upgrade to 1.0.0.h

Removed pkg-config.patch, which was incorporated upstream.

Addresses CVE-2012-0884.

Fixes bug [YOCTO #2139].

(From OE-Core rev: 50d99fc8c5a158c7f3ce3e72377827f53406d88f)

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

scripts/qemuimage-testlib: fix typos

(From OE-Core rev: 69f019c48b40ac3b7a8bce2da819f03072e78020)

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

task-self-hosted: add nfs-utils and nfs-utils-client into the target

Without this, in the target, we don't have the mount.nfs utility.

(From OE-Core rev: 42fb0129c701c52df978430da3d237c924d1d5ee)

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

cleanup-workdir: add a script to clean up WORKDIR

[Yocto 1561]
Add script cleanup-workdir to clean up WORKDIR. It checks every
package build directories under WORKDIR then parse the directory
name to get package name and version. If the version is not the
package prefer version then delete the directory.

(From OE-Core rev: 5eecfa7e504970a9ffde95e568ed7f8e7d6288b9)

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

parted: update to version 3.1

* Supports disks > 2TB

(From OE-Core rev: 27dd817838647d43769b400e7829730f7180a79a)

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

distro_tracking: updates for upgraded recipes and manual checks

Upgraded e2fsprogs recipe.

Manual checks done for libpng, libgdbus, expat, chrpath, opensp,
and nfs-utils.

(From OE-Core rev: 4ab84358f072e29c618d4e7532ab903747bbe618)

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

e2fsprogs: upgrade to 1.42.1

Includes minor tweaks to the formatting of some patch headers and the
addition of a SOB line where needed.

(From OE-Core rev: bb9af542bc69f417d414d92ebf46a9412944c1e1)

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

distro-tracking: Remove trailing whitespace

Remove all trailing whitespace from the distro tracking text.

(From OE-Core rev: 5fe34f0c6a6808a3abb0107c06b13b3d6ceb4ceb)

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

distro-tracking: Update rt-tests, trace-cmd, and kernel shark

o Add common fields for these recipes.
o Note no update due to being on the current version.

(From OE-Core rev: 0d5450cf0cca1d414109f34d47c4db5af3d80b6c)

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

libxxf86dga: Upgrade to 1.1.3

(From OE-Core rev: 99d3d7c461e3b19ea807dd7aabfcd4c239b531a6)

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

distro_tracking: Update

(From OE-Core rev: ed1c17d23836ccfff4e74ab4e2c4cc5ef9df59a3)

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

resolvconf: Upgrade to 1.64

(From OE-Core rev: a13d00df7768ecb297b47df307c44907b6f6dcb3)

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

imake: Upgrade to 1.0.5

(From OE-Core rev: fa21e26394a575a51fc1338c83deb20ccc1f4c23)

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

gnutls: Update to 2.12.17

(From OE-Core rev: bb7e461b08783a2acfef2f13b577ca9109c065fd)

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

libxi: upgrade to 1.4.5

(From OE-Core rev: 9d5bce4b769e78b95fd4d7e373b165f22db57a65)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxcb: upgrade to 1.8.1

(From OE-Core rev: 9084854652020f16a21e1214f7bb47cf0bd5a974)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

font-util: upgrade to 1.3.0

(From OE-Core rev: c58a6ea0a29960d9b6f683d70318080a39b884c1)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

inputproto: upgrade to 2.2

(From OE-Core rev: 5d42b72f7d813e862adebd0a805aff7caebb0790)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxres: upgrade to 1.0.6

(From OE-Core rev: 32f4b8621168111c7c0298efd8c046d54a5587e0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxfont: upgrade to 1.4.5

(From OE-Core rev: 5e62255e0e3d262b88d97ba4cfcffb5d7e307651)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libXvMC: upgrade to 1.0.7

(From OE-Core rev: 938b76383b24a44eb609fb4f88fa8f88179d74d2)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxtst: upgrade to 1.2.1

(From OE-Core rev: 672046dd2676ff0ff1e44f14f83dbe40e1f14de0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxft: upgrade to 2.3.0

(From OE-Core rev: 517976cf0c2a6eb5cf3656aa262c367f99fabc44)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libdmx: upgrade to 1.1.2

(From OE-Core rev: 7955ce5e8bd98287a81d2dfa2b82cfa17c8935fd)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxau: upgrade to 1.0.7

(From OE-Core rev: b627aebf3930d4c50c10336fc538faa36fce63a3)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxscrnsaver: upgrade to 1.2.2

(From OE-Core rev: 0bb6054c5d107ca8c3f795a899154009d17d350f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libfontenc: upgrade to 1.1.1

(From OE-Core rev: fce9ed7b0fdf184d045b353f9e08015c55cef450)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libXmu: upgrade to 1.1.1

The license change is:

--- libXmu-1.1.0/COPYING        2009-10-17 05:26:51.000000000 +0800
+++ libXmu-1.1.1/COPYING        2012-03-06 15:00:13.000000000 +0800
@@ -28,13 +28,13 @@

                         All Rights Reserved

-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.

 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

(From OE-Core rev: a75b4604d79a8d8f9a38ffe347546da856cb4cc1)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libxt: upgrade to 1.1.2

(From OE-Core rev: b61972beebab8cef38d68aca11c0d960e601f744)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libXv: upgrade to 1.0.7

The license change is:

--- libXv-1.0.6/COPYING 2009-10-17 05:27:22.000000000 +0800
+++ libXv-1.0.7/COPYING 2012-03-08 13:25:45.000000000 +0800
@@ -3,13 +3,13 @@

                         All Rights Reserved

-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Digital or MIT not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.

 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

(From OE-Core rev: eb51eebe14e961e63ceb1673cb7e349c8281849b)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libXext: upgrade to 1.3.1

The license change is:

--- libXext-1.3.0/COPYING       2010-11-22 03:24:13.000000000 +0800
+++ libXext-1.3.1/COPYING       2012-03-08 11:54:58.000000000 +0800
@@ -34,14 +34,14 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-Except as contained in this notice, the name of Digital Equipment Corporation
+Except as contained in this notice, the name of Digital Equipment Corporation
 shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
+dealings in this Software without prior written authorization from Digital
 Equipment Corporation.

 Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
@@ -81,7 +81,7 @@
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
 BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
@@ -116,8 +116,8 @@
 advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.

-Hewlett-Packard makes no representations about the
-suitability of this software for any purpose.  It is provided
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose.  It is provided
 "as is" without express or implied warranty.

 This software is not subject to any license of the American

(From OE-Core rev: 8e7750c68251fe1525ef01687e64b9c45161ccdd)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libxpm: upgrade to 3.5.10

(From OE-Core rev: ff3807abd2d798e74e4b04d3739a9b41ff2f14ea)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libXrender: upgrade to 0.9.7

The license change is:

--- libXrender-0.9.6/COPYING    2010-01-30 15:39:43.000000000 +0800
+++ libXrender-0.9.7/COPYING    2012-03-08 12:47:00.000000000 +0800
@@ -35,5 +35,5 @@
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
 BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

(From OE-Core rev: fd02e4a4c6774121d67559b09e4b03be42de983e)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libXxf86vm: upgrade to 1.1.2

The license change is:

--- libXxf86vm-1.1.1/COPYING    2010-01-30 15:40:42.000000000 +0800
+++ libXxf86vm-1.1.2/COPYING    2012-03-08 13:39:59.000000000 +0800
@@ -14,12 +14,12 @@
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.

-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
 or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY.

(From OE-Core rev: b5f1c7ddf30214a649d43dd0fa23160dc37792a6)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libxdmcp: upgrade to 1.1.1

(From OE-Core rev: e9b83f963c2989e1eecb5f5aa3051f7680ac2cee)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

pixman: upgrade to 0.25.2

(From OE-Core rev: 3da2e126cfec31e89422242cb8fd87004b32e84f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libice: upgrade to 1.0.8

(From OE-Core rev: 5ae0128ac4cd763e6d525834ba077944b1f03920)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxkbfile: upgrade to 1.0.8

The license change is below (only removing a space in the end of each line):

--- libxkbfile-1.0.7/COPYING    2009-10-17 05:27:13.000000000 +0800
+++ libxkbfile-1.0.8/COPYING    2012-03-08 12:37:23.000000000 +0800
@@ -5,19 +5,19 @@
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.

-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.

@@ -48,13 +48,13 @@
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
                         All Rights Reserved

-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.

 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

(From OE-Core rev: 5165e1b6fcbfcaabf0d22f8be4e08ee838b198ab)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libsm: upgrade to 1.2.1

The license change is because:

--- libsm-1_1.2.0-r1/libSM-1.2.0/COPYING        2010-01-15 12:59:55.000000000 +0800
+++ libsm-1_1.2.1-r0/libSM-1.2.1/COPYING        2012-03-03 12:53:55.000000000 +0800
@@ -1,4 +1,4 @@
-Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.

 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.

+
 Copyright 1993, 1998  The Open Group

 Permission to use, copy, modify, distribute, and sell this software and its

(From OE-Core rev: 27fbb481e1b39ce5cfdecf19bb434be096392e72)

Signed-off-by: Shane Wang <shane.wang@intel.com>

libxinerama: upgrade to 1.1.2

(From OE-Core rev: a018782f307265da602e24c6303f48c4c2fc4e78)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libxcursor: upgrade to 1.1.13

(From OE-Core rev: 8ec0242632cc1ec66434b842ac0dd38b58d2ba49)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

util-macros: upgrade to 1.17

(From OE-Core rev: 5c7da2d3599dc7a9e2aa6f015e256af4662a9c24)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tzdata: upgrade to 2012b

(From OE-Core rev: fe25af6ba39a0bf0227d5c3977a74ee0329dc95e)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

minicom: upgrade to 2.6.1

(From OE-Core rev: 2ac64d0c351c63068a91fec5d73d848cfde8d173)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

apr: upgrade to 1.4.6

(From OE-Core rev: f79819fe3d78c1da74753174efbc2fb2b1239da0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

dropbear: upgrade to 2012.55

(From OE-Core rev: 1804020514f122a3b3825c627e8eb51017425bbb)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

curl: upgrade to 7.24.0

(From OE-Core rev: ade51262effbf809c23bcf879ba43b7945e459ff)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: upgrade to 1.19.4

Removing the patch busybox-1.19.3-getty.patch is because it is already in the upstream.

(From OE-Core rev: f03f8eac4c72be0f16468ebd0ee4dd1f07b0563b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libpcap: upgrade to 1.2.1

(From OE-Core rev: 98b9c17f2c236e1a23d9c74d93cb693b4d7b4d61)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gst-plugins-ugly: upgrade to 0.10.19

(From OE-Core rev: b42e6dbd4c3a780fd9221097b1719a1d62ce4284)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gst-plugins-bad: upgrade to 0.10.23

(From OE-Core rev: 42159daa98d17b301c1f64ef61c30c5fbd2a1f4c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gst-plugins-good: Fix packaging

WARNING: For recipe gst-plugins-base, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/gst-plugins-base
WARNING:   /usr/share/gst-plugins-base/license-translations.dict

(From OE-Core rev: 29e37e599fedb355000f532a1607a92ebb3e275f)

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

gst-plugins-good: upgrade to 0.10.31

(From OE-Core rev: a28f20abe0457789b2bb3034635e41e0b2bbdba2)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gst-plugins-base: upgrade to 0.10.36

(From OE-Core rev: 10c24f924f46784f91f1113aca6e18838aada0fd)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gstreamer: upgrade to 0.10.36

(From OE-Core rev: f19fe90ef79f1311e38eaca7dfe7e5578139069f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gst-plugin-bluetooth: Fix package warnings

WARNING: For recipe gst-plugin-bluetooth, the following files/directories were installed but not shipped in any package:
WARNING:   /var
WARNING:   /usr/lib/bluetooth
WARNING:   /usr/lib/bluetooth/plugins
WARNING:   /usr/lib/alsa-lib/libasound_module_pcm_bluetooth.so
WARNING:   /usr/lib/alsa-lib/libasound_module_ctl_bluetooth.so
WARNING:   /usr/lib/alsa-lib/libasound_module_ctl_bluetooth.la
WARNING:   /usr/lib/alsa-lib/libasound_module_pcm_bluetooth.la
WARNING:   /usr/share/alsa
WARNING:   /usr/share/alsa/bluetooth.conf
WARNING:   /var/lib
WARNING:   /var/lib/bluetooth

These are removed because they are packages in the bluez4 package

(From OE-Core rev: eae2b9c21e9d57ad192eeded4301b548f7e3d5b5)

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

gst-plugin-bluetooth: upgrade to 4.99

(From OE-Core rev: ad9cdcffa219e2c185f0e40f50d44f63ed521c9c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bluez-hcidump: upgrade to 2.3

(From OE-Core rev: b96700e2d788624248ef72d49da4296d6c58808e)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bluez4: upgrade to 4.99

(From OE-Core rev: fac7863c0f00b442283689e27fae153ccf5428b0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

ofono: upgrade to 1.5

(From OE-Core rev: 5624201471f9d3fb7c6d9858a40f63dd88354f94)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

telepathy-mission-control: fix package warnings

WARNING: For recipe telepathy-mission-control, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/share/glib-2.0
WARNING:   /usr/share/glib-2.0/schemas
WARNING:   /usr/share/glib-2.0/schemas/im.telepathy.MissionControl.FromEmpathy.gschema.xml
(From OE-Core rev: 9a63238fe3802f3b9e94f90bb092c24cf20a40a5)

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

telepathy-mission-control: upgrade to 5.11.0

(From OE-Core rev: dfa9defe54d35e309e0a2a47076692c775488c7b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

telepathy-glib: upgrade to 0.17.5

(From OE-Core rev: f0481bcc1866c9ead0febd7b7c8355e8416bb2c4)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tremor: upgrade to 18221

(From OE-Core rev: 2ef8cfa58d0bfca1b9bf6a204ae4a05d6e3af03f)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

libvorbis: upgrade to 1.3.3

(From OE-Core rev: 5205af02970fbbf7c2f9b945f38685e0ef283d6a)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

glproto: update its info in distro tracking

(From OE-Core rev: 8631db2811a2d51a76a1d76ace425c55fc1858ac)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gdk-pixbuf: upgrade to 2.24.1

(From OE-Core rev: a9c128897e7fa496cf8f297819b64bdc7b8c319c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

dbus-glib: upgrade to 0.98

(From OE-Core rev: 4634aa0fabb9646ba61597cb81f74a242144cd14)

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

glib-2.0: upgrade to 2.30.3

(From OE-Core rev: 19e041720699776c58280d07d5bf5f18246a42d9)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

xserver-kdrive: compile xserver without dtrace support

Cross compiling of xserver-kdrive fails if dtrace is enabled. Configure
script enables dtrace automatically if dtrace binary exists. xserver-kdrive
compiling was failed if systemtap package was builded beforehand because
systemtap provides dtrace binary.

(From OE-Core rev: 5d404fdb36b0535ce758d98408b02134cdbce4ee)

Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

sysvinit-inittab: Fixed license warning.

WARNING: .../sysvinit-inittab-2.88dsf-r6/sysvinit-2.88dsf/COPYING could
not be copied for some reason. It may not exist. WARN for now.

(From OE-Core rev: 85e4d0c4bb024a67b61afb0f0fedfb15d6aa0d18)

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