[PATCH 00/27] Consolidated pull

[PATCH 00/27] Consolidated pull

[Ross Burton]

Hi,

Working through the patch backlog, here is my first consolidated pull.  For
anyone watching closely this has had a few patches removed from the autobuilder
run which has some failures.

Ross

The following changes since commit 1894522f357fdf0b6adb2dcc14f12817628596bd:

  bitbake: tinfoil: add a means of enabling variable history tracking (2014-09-05 10:14:25 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ross/mut

for you to fetch changes up to 10bd19c2bde21e4e10615548c682c2001741eb19:

  alsa-utils: hard-code alsa-utils in SRC_URI (2014-09-08 12:53:09 +0100)

----------------------------------------------------------------
Chong Lu (2):
      libunwind: add recipes
      perf: add libunwind support

Cristian Iorga (1):
      alsa-utils: upgrade to 1.0.28

Dan McGregor (2):
      sudo: make sudoers a config file
      lighttpd: install config file without execute permissions

Drew Moseley (1):
      gstreamer: Set DEPENDS dynamically for plugins-ugly and plugins-bad

Fathi Boudra (1):
      shadow: add Qualcomm and STMicroelectronics SoCs

Hongxu Jia (3):
      sstate: Add extra intercept functions SSTATEPOSTCREATEFUNCS
      bbclass/sstate: add hook SSTATE_CHECK_FUNCTIONS for sstate checking
      bbclass/sstate_readonly: only allowed sstate-cache objects to be built (read-only sstate-cache)

Kévin THIERRY (1):
      package_manager: RpmPkgsList: determine rpm version

Marius Avram (1):
      glib-2.0: fix mount detection

Marko Lindqvist (5):
      gtk+2: update to 2.24.24
      libpng: drop unnecessary automake requirement lowering patch
      libpng: update to 1.6.13
      pango: update to 1.36.6
      gtk+3: update to 3.12.2

Martin Jansa (1):
      qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

Mikhail Durnev (1):
      libxkbcommon: Add missing dependency on xkeyboard-config

Richard Purdie (1):
      alsa-utils: hard-code alsa-utils in SRC_URI

Robert Yang (2):
      insane.bbclass: add QA check: file-rdeps
      package_manager.py: use RPM_PREFER_ELF_ARCH

Ross Burton (1):
      pixman: upgrade to 0.32.6

Sujith H (2):
      os-release: Adding a new recipe for operating system identification
      systemd: Adding RRECOMMENDS for os-release

Yasir-Khan (2):
      bluez5: Allow method calls over dbus for bluetooth daemon
      python-native: disable user site support

 meta/classes/insane.bbclass                        |   72 +++++++++++++++++++-
 meta/classes/qemu.bbclass                          |   25 +++----
 meta/classes/sstate.bbclass                        |   30 +++++++-
 meta/classes/sstate_readonly.bbclass               |   53 ++++++++++++++
 meta/lib/oe/package_manager.py                     |   35 +++++-----
 meta/lib/oe/rootfs.py                              |    2 +-
 .../bluez5/bluez5/bluetooth.conf                   |    1 +
 ...un-media-sdX-drive-mount-if-username-root.patch |   39 +++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb      |    1 +
 meta/recipes-core/os-release/os-release.bb         |   36 ++++++++++
 meta/recipes-core/systemd/systemd_216.bb           |    2 +-
 .../recipes-devtools/python/python-native_2.7.3.bb |    4 ++
 meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb  |    2 +-
 meta/recipes-extended/shadow/files/securetty       |   15 ++++
 meta/recipes-extended/sudo/sudo.inc                |    2 +
 ...utton-do-not-prelight-in-touchscreen-mode.patch |    0
 ...Duplicate-the-exec-string-returned-by-gtk.patch |    0
 .../cellrenderer-cairo.patch                       |    0
 .../configure-nm.patch                             |    0
 .../configurefix.patch                             |    0
 .../{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch |    0
 .../entry-cairo.patch                              |    0
 .../hardcoded_libtool.patch                        |    0
 .../run-iconcache.patch                            |   11 +--
 .../toggle-font.diff                               |    0
 .../{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch |    0
 meta/recipes-gnome/gtk+/gtk+3.inc                  |    6 +-
 .../fix-build-when-wayland-backend-enabled.patch   |   43 ------------
 .../gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb}      |    5 +-
 .../gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb}      |    4 +-
 .../pango/{pango_1.36.5.bb => pango_1.36.6.bb}     |    4 +-
 .../xorg-lib/libxkbcommon_0.4.3.bb                 |    2 +-
 .../xorg-lib/pixman/mips-export-revert.patch       |   22 ++++++
 .../{pixman_0.32.4.bb => pixman_0.32.6.bb}         |    5 +-
 meta/recipes-kernel/perf/perf-features.inc         |    2 +-
 meta/recipes-kernel/perf/perf.bb                   |    5 +-
 .../gstreamer/gst-meta-base_0.10.bb                |    7 +-
 .../gstreamer/gstreamer1.0-meta-base.bb            |    5 +-
 ...0001-configure-lower-automake-requirement.patch |   31 ---------
 .../libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb}  |   11 ++-
 meta/recipes-support/libunwind/libunwind.inc       |   30 ++++++++
 meta/recipes-support/libunwind/libunwind_1.1.bb    |    4 ++
 42 files changed, 381 insertions(+), 135 deletions(-)
 create mode 100644 meta/classes/sstate_readonly.bbclass
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
 create mode 100644 meta/recipes-core/os-release/os-release.bb
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch (72%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch (100%)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
 rename meta/recipes-gnome/gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} (75%)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} (93%)
 rename meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} (56%)
 create mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
 rename meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} (86%)
 delete mode 100644 meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
 rename meta/recipes-multimedia/libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} (58%)
 create mode 100644 meta/recipes-support/libunwind/libunwind.inc
 create mode 100644 meta/recipes-support/libunwind/libunwind_1.1.bb

Chong Lu (2):
  libunwind: add recipes
  perf: add libunwind support

Cristian Iorga (1):
  alsa-utils: upgrade to 1.0.28

Dan McGregor (2):
  sudo: make sudoers a config file
  lighttpd: install config file without execute permissions

Drew Moseley (1):
  gstreamer: Set DEPENDS dynamically for plugins-ugly and plugins-bad

Fathi Boudra (1):
  shadow: add Qualcomm and STMicroelectronics SoCs

Hongxu Jia (3):
  sstate: Add extra intercept functions SSTATEPOSTCREATEFUNCS
  bbclass/sstate: add hook SSTATE_CHECK_FUNCTIONS for sstate checking
  bbclass/sstate_readonly: only allowed sstate-cache objects to be
    built (read-only sstate-cache)

Kévin THIERRY (1):
  package_manager: RpmPkgsList: determine rpm version

Marius Avram (1):
  glib-2.0: fix mount detection

Marko Lindqvist (5):
  gtk+2: update to 2.24.24
  libpng: drop unnecessary automake requirement lowering patch
  libpng: update to 1.6.13
  pango: update to 1.36.6
  gtk+3: update to 3.12.2

Martin Jansa (1):
  qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

Mikhail Durnev (1):
  libxkbcommon: Add missing dependency on xkeyboard-config

Richard Purdie (1):
  alsa-utils: hard-code alsa-utils in SRC_URI

Robert Yang (2):
  insane.bbclass: add QA check: file-rdeps
  package_manager.py: use RPM_PREFER_ELF_ARCH

Ross Burton (1):
  pixman: upgrade to 0.32.6

Sujith H (2):
  os-release: Adding a new recipe for operating system identification
  systemd: Adding RRECOMMENDS for os-release

Yasir-Khan (2):
  bluez5: Allow method calls over dbus for bluetooth daemon
  python-native: disable user site support

 meta/classes/insane.bbclass                        |   72 +++++++++++++++++++-
 meta/classes/qemu.bbclass                          |   25 +++----
 meta/classes/sstate.bbclass                        |   30 +++++++-
 meta/classes/sstate_readonly.bbclass               |   53 ++++++++++++++
 meta/lib/oe/package_manager.py                     |   35 +++++-----
 meta/lib/oe/rootfs.py                              |    2 +-
 .../bluez5/bluez5/bluetooth.conf                   |    1 +
 ...un-media-sdX-drive-mount-if-username-root.patch |   39 +++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb      |    1 +
 meta/recipes-core/os-release/os-release.bb         |   36 ++++++++++
 meta/recipes-core/systemd/systemd_216.bb           |    2 +-
 .../recipes-devtools/python/python-native_2.7.3.bb |    4 ++
 meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb  |    2 +-
 meta/recipes-extended/shadow/files/securetty       |   15 ++++
 meta/recipes-extended/sudo/sudo.inc                |    2 +
 ...utton-do-not-prelight-in-touchscreen-mode.patch |    0
 ...Duplicate-the-exec-string-returned-by-gtk.patch |    0
 .../cellrenderer-cairo.patch                       |    0
 .../configure-nm.patch                             |    0
 .../configurefix.patch                             |    0
 .../{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch |    0
 .../entry-cairo.patch                              |    0
 .../hardcoded_libtool.patch                        |    0
 .../run-iconcache.patch                            |   11 +--
 .../toggle-font.diff                               |    0
 .../{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch |    0
 meta/recipes-gnome/gtk+/gtk+3.inc                  |    6 +-
 .../fix-build-when-wayland-backend-enabled.patch   |   43 ------------
 .../gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb}      |    5 +-
 .../gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb}      |    4 +-
 .../pango/{pango_1.36.5.bb => pango_1.36.6.bb}     |    4 +-
 .../xorg-lib/libxkbcommon_0.4.3.bb                 |    2 +-
 .../xorg-lib/pixman/mips-export-revert.patch       |   22 ++++++
 .../{pixman_0.32.4.bb => pixman_0.32.6.bb}         |    5 +-
 meta/recipes-kernel/perf/perf-features.inc         |    2 +-
 meta/recipes-kernel/perf/perf.bb                   |    5 +-
 .../gstreamer/gst-meta-base_0.10.bb                |    7 +-
 .../gstreamer/gstreamer1.0-meta-base.bb            |    5 +-
 ...0001-configure-lower-automake-requirement.patch |   31 ---------
 .../libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb}  |   11 ++-
 meta/recipes-support/libunwind/libunwind.inc       |   30 ++++++++
 meta/recipes-support/libunwind/libunwind_1.1.bb    |    4 ++
 42 files changed, 381 insertions(+), 135 deletions(-)
 create mode 100644 meta/classes/sstate_readonly.bbclass
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
 create mode 100644 meta/recipes-core/os-release/os-release.bb
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch (72%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch (100%)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
 rename meta/recipes-gnome/gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} (75%)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} (93%)
 rename meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} (56%)
 create mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
 rename meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} (86%)
 delete mode 100644 meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
 rename meta/recipes-multimedia/libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} (58%)
 create mode 100644 meta/recipes-support/libunwind/libunwind.inc
 create mode 100644 meta/recipes-support/libunwind/libunwind_1.1.bb

-- 
1.7.10.4

[PATCH 01/27] package_manager: RpmPkgsList: determine rpm version

[Ross Burton]

From: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

Do not set the rpm_version to 5 if it is not provided, instead
determine the real rpm version.

(From OE-Core rev: 48beaee2e5b2b4ae35c596c19f8a38e0ff4427e9)

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/lib/oe/package_manager.py |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 86cef02..a1ac6eb 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -210,7 +210,7 @@ class PkgsList(object):
 
 
 class RpmPkgsList(PkgsList):
-    def __init__(self, d, rootfs_dir, arch_var=None, os_var=None, rpm_version=5):
+    def __init__(self, d, rootfs_dir, arch_var=None, os_var=None):
         super(RpmPkgsList, self).__init__(d, rootfs_dir)
 
         self.rpm_cmd = bb.utils.which(os.getenv('PATH'), "rpm")
@@ -219,7 +219,14 @@ class RpmPkgsList(PkgsList):
         self.ml_prefix_list, self.ml_os_list = \
             RpmIndexer(d, rootfs_dir).get_ml_prefix_and_os_list(arch_var, os_var)
 
-        self.rpm_version = rpm_version
+        # Determine rpm version
+        cmd = "%s --version" % self.rpm_cmd
+        try:
+            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
+        except subprocess.CalledProcessError as e:
+            bb.fatal("Getting rpm version failed. Command '%s' "
+                     "returned %d:\n%s" % (cmd, e.returncode, e.output))
+        self.rpm_version = int(output.split()[-1].split('.')[0])
 
     '''
     Translate the RPM/Smart format names to the OE multilib format names
@@ -564,17 +571,9 @@ class RpmPM(PackageManager):
         if not os.path.exists(self.d.expand('${T}/saved')):
             bb.utils.mkdirhier(self.d.expand('${T}/saved'))
 
-        # Determine rpm version
-        cmd = "%s --version" % self.rpm_cmd
-        try:
-            output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True)
-        except subprocess.CalledProcessError as e:
-            bb.fatal("Getting rpm version failed. Command '%s' "
-                     "returned %d:\n%s" % (cmd, e.returncode, e.output))
-        self.rpm_version = int(output.split()[-1].split('.')[0])
-
         self.indexer = RpmIndexer(self.d, self.deploy_dir)
-        self.pkgs_list = RpmPkgsList(self.d, self.target_rootfs, arch_var, os_var, self.rpm_version)
+        self.pkgs_list = RpmPkgsList(self.d, self.target_rootfs, arch_var, os_var)
+        self.rpm_version = self.pkgs_list.rpm_version
 
         self.ml_prefix_list, self.ml_os_list = self.indexer.get_ml_prefix_and_os_list(arch_var, os_var)
 
-- 
1.7.10.4

[PATCH 02/27] sstate: Add extra intercept functions SSTATEPOSTCREATEFUNCS

[Ross Burton]

From: Hongxu Jia <hongxu.jia@windriver.com>

In some cases we do either need to add extra sstate manipulation
functions, or change the existing modification functions. This patch
parametrizes it to SSTATEPOSTCREATEFUNCS after sstate_create_package

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/sstate.bbclass |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index ead829e..67e0c1d 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -33,6 +33,7 @@ BB_HASHFILENAME = "${SSTATE_EXTRAPATH} ${SSTATE_PKGSPEC} ${SSTATE_SWSPEC}"
 SSTATE_MANMACH ?= "${SSTATE_PKGARCH}"
 
 SSTATECREATEFUNCS = "sstate_hardcode_path"
+SSTATEPOSTCREATEFUNCS = ""
 SSTATEPREINSTFUNCS = ""
 SSTATEPOSTUNPACKFUNCS = "sstate_hardcode_path_unpack"
 SSTATEPOSTINSTFUNCS = ""
@@ -512,7 +513,8 @@ def sstate_package(ss, d):
     d.setVar('SSTATE_BUILDDIR', sstatebuild)
     d.setVar('SSTATE_PKG', sstatepkg)
 
-    for f in (d.getVar('SSTATECREATEFUNCS', True) or '').split() + ['sstate_create_package']:
+    for f in (d.getVar('SSTATECREATEFUNCS', True) or '').split() + ['sstate_create_package'] + \
+             (d.getVar('SSTATEPOSTCREATEFUNCS', True) or '').split():
         bb.build.exec_func(f, d)
   
     bb.siggen.dump_this_task(sstatepkg + ".siginfo", d)
-- 
1.7.10.4

[PATCH 03/27] insane.bbclass: add QA check: file-rdeps

[Ross Burton]

From: Robert Yang <liezhi.yang@windriver.com>

The ipk or deb can't depend on file such as "/bin/bash" or
"/usr/bin/perl", so it knows nothing about the pkg depends bash or perl,
thus there would be dependencies problems when we run "apt-get
install/remove <pkg>" on the target, this check can help us find the
issues and then fix them manually.

* Benefits:
  - Help to fix file rdepends issues for ipk and deb
  - Help to fix abnormal rdepends.
  - Help to check whether the rdepends is OK or not after build each
    recipe (don't have to install to the image), for example, a recipe may
    generate 10 binary packages, only a part of them will be installed to
    the image by default, we can know whether the rdepends are OK or
    not for the ones which are installed, but can't know the ones which
    are not installed, this patch can help check all the 10 binary
    packages' rdepends.

* Basic designs:
  - Get all the RDEPENDS on the chain.

  - Get the pkg's FILERPROVIDES from oe.packagedata.read_subpkgdata()
    and save to set filerdepends.

  - Get each RPDEPENDS' FILERPROVIDES, RPROVIDES and FILERPROVIDESFLIST,
    and save to set rdep_rprovides.

  - Do the set "filerdepends -= rdep_rprovides" and QA issue if
    filerdepends is not null.

[YOCTO #1662]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/insane.bbclass |   72 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 3dd2e7f..c6dea22 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -29,7 +29,7 @@ QA_SANE = "True"
 WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \
             textrel already-stripped incompatible-license files-invalid \
             installed-vs-shipped compile-host-path install-host-path \
-            pn-overrides infodir build-deps \
+            pn-overrides infodir build-deps file-rdeps \
             "
 ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
             perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
@@ -797,6 +797,76 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
                 error_msg = "%s rdepends on %s, but it isn't a build dependency?" % (pkg, rdepend)
                 sane = package_qa_handle_error("build-deps", error_msg, d)
 
+        if "file-rdeps" not in skip:
+            ignored_file_rdeps = set(['/bin/sh', '/usr/bin/env', 'rtld(GNU_HASH)'])
+            if bb.data.inherits_class('nativesdk', d):
+                ignored_file_rdeps |= set(['/bin/bash', '/usr/bin/perl'])
+            # For Saving the FILERDEPENDS
+            filerdepends = set()
+            rdep_data = oe.packagedata.read_subpkgdata(pkg, d)
+            for key in rdep_data:
+                if key.startswith("FILERDEPENDS_"):
+                    for subkey in rdep_data[key].split():
+                        filerdepends.add(subkey)
+            filerdepends -= ignored_file_rdeps
+
+            if filerdepends:
+                next = rdepends
+                done = rdepends[:]
+                # Find all the rdepends on the dependency chain
+                while next:
+                    new = []
+                    for rdep in next:
+                        rdep_data = oe.packagedata.read_subpkgdata(rdep, d)
+                        sub_rdeps = rdep_data.get("RDEPENDS_" + rdep)
+                        if not sub_rdeps:
+                            continue
+                        for sub_rdep in sub_rdeps.split():
+                            if sub_rdep in done:
+                                continue
+                            if not sub_rdep.startswith('(') and \
+                                    oe.packagedata.has_subpkgdata(sub_rdep, d):
+                                # It's a new rdep
+                                done.append(sub_rdep)
+                                new.append(sub_rdep)
+                    next = new
+
+                # Add the rprovides of itself
+                if pkg not in done:
+                    done.insert(0, pkg)
+
+                # The python is not a package, but python-core provides it, so
+                # skip checking /usr/bin/python if python is in the rdeps, in
+                # case there is a RDEPENDS_pkg = "python" in the recipe.
+                for py in [ d.getVar('MLPREFIX', True) + "python", "python" ]:
+                    if py in done:
+                        filerdepends.discard("/usr/bin/python")
+                        done.remove(py)
+                for rdep in done:
+                    # For Saving the FILERPROVIDES, RPROVIDES and FILES_INFO
+                    rdep_rprovides = set()
+                    rdep_data = oe.packagedata.read_subpkgdata(rdep, d)
+                    for key in rdep_data:
+                        if key.startswith("FILERPROVIDES_") or key.startswith("RPROVIDES_"):
+                            for subkey in rdep_data[key].split():
+                                rdep_rprovides.add(subkey)
+                        # Add the files list to the rprovides
+                        if key == "FILES_INFO":
+                            # Use eval() to make it as a dict
+                            for subkey in eval(rdep_data[key]):
+                                rdep_rprovides.add(subkey)
+                    filerdepends -= rdep_rprovides
+                    if not filerdepends:
+                        # Break if all the file rdepends are met
+                        break
+                    else:
+                        # Clear it for the next loop
+                        rdep_rprovides.clear()
+            if filerdepends:
+                error_msg = "%s requires %s, but no providers in its RDEPENDS" % \
+                            (pkg, ', '.join(str(e) for e in filerdepends))
+                sane = package_qa_handle_error("file-rdeps", error_msg, d)
+
     return sane
 
 def package_qa_check_deps(pkg, pkgdest, skip, d):
-- 
1.7.10.4

[PATCH 04/27] sudo: make sudoers a config file

[Ross Burton]

From: Dan McGregor <dan.mcgregor@usask.ca>

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/sudo/sudo.inc |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 6de984a..1d7e541 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -18,6 +18,8 @@ inherit autotools
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
 
+CONFFILES_${PN} = "${sysconfdir}/sudoers"
+
 EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor"
 
 do_configure_prepend () {
-- 
1.7.10.4

[PATCH 05/27] lighttpd: install config file without execute permissions

[Ross Burton]

From: Dan McGregor <dan.mcgregor@usask.ca>

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb
index 0acc37d..20d5c1c 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb
@@ -51,7 +51,7 @@ SYSTEMD_SERVICE_${PN} = "lighttpd.service"
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
 	install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}
 	install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
 
 	install -d ${D}${systemd_unitdir}/system
-- 
1.7.10.4

[PATCH 06/27] libunwind: add recipes

[Ross Burton]

From: Chong Lu <Chong.Lu@windriver.com>

Add libunwind from meta-oe to oe-core, since perf depends on it.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-support/libunwind/libunwind.inc    |   30 +++++++++++++++++++++++
 meta/recipes-support/libunwind/libunwind_1.1.bb |    4 +++
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-support/libunwind/libunwind.inc
 create mode 100644 meta/recipes-support/libunwind/libunwind_1.1.bb

diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
new file mode 100644
index 0000000..b27b9e5
--- /dev/null
+++ b/meta/recipes-support/libunwind/libunwind.inc
@@ -0,0 +1,30 @@
+DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program"
+HOMEPAGE = "http://www.nongnu.org/libunwind"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5"
+
+SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
+
+inherit autotools
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,lzma"
+
+EXTRA_OECONF_arm = "--enable-debug-frame"
+
+CFLAGS += "${ATOMICOPS}"
+ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1"
+ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1"
+ATOMICOPS ?= ""
+
+LDFLAGS += "${LIBATOMICS}"
+LIBATOMICS_armv5 = "-latomic_ops"
+LIBATOMICS_armv4 = "-latomic_ops"
+LIBATOMICS ?= ""
+
+DEPENDS += "${DEPLIBATOMICS}"
+DEPLIBATOMICS_armv5 = "libatomics-ops"
+DEPLIBATOMICS_armv4 = "libatomics-ops"
+DEPLIBATOMICS ?= ""
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/libunwind/libunwind_1.1.bb b/meta/recipes-support/libunwind/libunwind_1.1.bb
new file mode 100644
index 0000000..bc38e36
--- /dev/null
+++ b/meta/recipes-support/libunwind/libunwind_1.1.bb
@@ -0,0 +1,4 @@
+require libunwind.inc
+
+SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce"
+SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a"
-- 
1.7.10.4

[PATCH 07/27] perf: add libunwind support

[Ross Burton]

From: Chong Lu <Chong.Lu@windriver.com>

Add a new feature named 'perf-libunwind'. Adding this support to perf allows it
to do stack traces on ARM - thumb2 and MIPS targets. PERF_FEATURES variable in
perf-features.inc will enable the perf-libunwind.

Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-kernel/perf/perf-features.inc |    2 +-
 meta/recipes-kernel/perf/perf.bb           |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/perf/perf-features.inc b/meta/recipes-kernel/perf/perf-features.inc
index b8859ab..2dbbb47 100644
--- a/meta/recipes-kernel/perf/perf-features.inc
+++ b/meta/recipes-kernel/perf/perf-features.inc
@@ -1,4 +1,4 @@
-PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
+PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui perf-libunwind"
 
 def perf_feature_enabled(feature, trueval, falseval, d):
     """
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index ebfedb9..cbd03f2 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -20,6 +20,7 @@ BUILDPERF_libc-uclibc = "no"
 # to cover a wide range of kernel we add both dependencies
 TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}"
 SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}"
+LIBUNWIND_DEPENDS = "${@perf_feature_enabled('perf-libunwind', 'libunwind', '',d)}"
 
 DEPENDS = "virtual/kernel \
     virtual/${MLPREFIX}libc \
@@ -27,6 +28,7 @@ DEPENDS = "virtual/kernel \
     ${MLPREFIX}binutils \
     ${TUI_DEPENDS} \
     ${SCRIPTING_DEPENDS} \
+    ${LIBUNWIND_DEPENDS} \
     bison flex \
 "
 
@@ -62,6 +64,7 @@ B = "${WORKDIR}/${BPN}-${PV}"
 
 SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}"
 TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
+LIBUNWIND_DEFINES = "${@perf_feature_enabled('perf-libunwind', '', 'NO_LIBUNWIND=1',d)}"
 
 # The LDFLAGS is required or some old kernels fails due missing
 # symbols and this is preferred than requiring patches to every old
@@ -76,7 +79,7 @@ EXTRA_OEMAKE = '\
     CC="${CC}" \
     AR="${AR}" \
     perfexecdir=${libexecdir} \
-    NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 NO_LIBUNWIND=1 ${SCRIPTING_DEFINES} \
+    NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} ${SCRIPTING_DEFINES} \
 '
 
 EXTRA_OEMAKE += "\
-- 
1.7.10.4

[PATCH 08/27] package_manager.py: use RPM_PREFER_ELF_ARCH

[Ross Burton]

From: Robert Yang <liezhi.yang@windriver.com>

Use RPM_PREFER_ELF_ARCH to instead of RPM_PREFER_COLOR as rpm upstream
suggested, and use "4" to instead of "3" since it is a bit mask (not
enumeration), so we need "4" here.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/lib/oe/package_manager.py |   12 ++++++------
 meta/lib/oe/rootfs.py          |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index a1ac6eb..b3b3b2d 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -819,17 +819,17 @@ class RpmPM(PackageManager):
                            self.d.getVar('localstatedir', True))
         cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp'
 
-        prefer_color = self.d.getVar('RPM_PREFER_COLOR', True)
+        prefer_color = self.d.getVar('RPM_PREFER_ELF_ARCH', True)
         if prefer_color:
-            if prefer_color not in ['0', '1', '2', '3']:
-                bb.fatal("Invalid RPM_PREFER_COLOR: %s, it should be one of:\n"
+            if prefer_color not in ['0', '1', '2', '4']:
+                bb.fatal("Invalid RPM_PREFER_ELF_ARCH: %s, it should be one of:\n"
                         "\t1: ELF32 wins\n"
                         "\t2: ELF64 wins\n"
-                        "\t3: ELF64 N32 wins (mips64 or mips64el only)" %
+                        "\t4: ELF64 N32 wins (mips64 or mips64el only)" %
                         prefer_color)
-            if prefer_color == "3" and self.d.getVar("TUNE_ARCH", True) not in \
+            if prefer_color == "4" and self.d.getVar("TUNE_ARCH", True) not in \
                                     ['mips64', 'mips64el']:
-                bb.fatal("RPM_PREFER_COLOR = \"3\" is for mips64 or mips64el "
+                bb.fatal("RPM_PREFER_ELF_ARCH = \"4\" is for mips64 or mips64el "
                          "only.")
             self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
                         % prefer_color)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0424a01..3d8ae81 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -330,7 +330,7 @@ class RpmRootfs(Rootfs):
     @staticmethod
     def _depends_list():
         return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS',
-                'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_COLOR']
+                'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_ELF_ARCH']
 
     def _get_delayed_postinsts(self):
         postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts")
-- 
1.7.10.4

[PATCH 09/27] bbclass/sstate: add hook SSTATE_CHECK_FUNCTIONS for sstate checking

[Ross Burton]

From: Hongxu Jia <hongxu.jia@windriver.com>

Provide hook for sstate checking, the checking failure will
break the building immediately. Pass input parameters by
bb.data (d.setVar/d.getVar).

Hook  : SSTATE_CHECK_FUNCTIONS
Input : missed    - list of missing sstate file index in sq
      : found     - list of existing sstate file index in sq
      : sq_fn     - list of filenames in the sq
      : sq_task   - list of task names in the sq
      : sq_hash   - list of task hash in the sq
      : sq_hashfn - list of hashfn in the sq

[YOCTO #6639]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/sstate.bbclass |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 67e0c1d..5a2e0c6 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -624,6 +624,18 @@ sstate_unpack_package () {
 
 BB_HASHCHECK_FUNCTION = "sstate_checkhashes"
 
+# Provide hook for sstate checking, the checking failure will
+# break the building immediately. Pass input parameters by
+# bb.data (d.setVar/d.getVar).
+# Input : missed    - list of missing sstate file index in sq
+#       : found     - list of existing sstate file index in sq
+#       : sq_fn     - list of filenames in the sq
+#       : sq_task   - list of task names in the sq
+#       : sq_hash   - list of task hash in the sq
+#       : sq_hashfn - list of hashfn in the sq
+#
+SSTATE_CHECK_FUNCTIONS ?= ""
+
 def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
 
     ret = []
@@ -712,6 +724,20 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
             evdata['found'].append( (sq_fn[task], sq_task[task], sq_hash[task], sstatefile ) )
         bb.event.fire(bb.event.MetadataEvent("MissedSstate", evdata), d)
 
+    localdata = bb.data.createCopy(d)
+    bb.data.update_data(localdata)
+    for f in (localdata.getVar('SSTATE_CHECK_FUNCTIONS', True) or '').split():
+        localdata = bb.data.createCopy(d)
+        bb.data.update_data(localdata)
+        localdata.setVar('missed', missed)
+        localdata.setVar('found', ret)
+        localdata.setVar('sq_fn', sq_fn)
+        localdata.setVar('sq_task', sq_task)
+        localdata.setVar('sq_hash', sq_hash)
+        localdata.setVar('sq_hashfn', sq_hashfn)
+
+        bb.build.exec_func(f, localdata)
+
     return ret
 
 BB_SETSCENE_DEPVALID = "setscene_depvalid"
-- 
1.7.10.4

[PATCH 10/27] bbclass/sstate_readonly: only allowed sstate-cache objects to be built (read-only sstate-cache)

[Ross Burton]

From: Hongxu Jia <hongxu.jia@windriver.com>

The requirement is the developer who demand only the "new" software
they write is allowed to be compiled from source, they only want to
reuse binaries from an existed sstate-cache, if the developer makes
a change that triggers a rebuild, it should be an instant error.

When the readonly sstate-cache is enabled, an error will be generated
if a recipe is not available within the sstate-cache. Adding recipes
to the whitelist will allow only select recipes to be allowed to build
from source.

[YOCTO #6639]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/sstate_readonly.bbclass |   53 ++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 meta/classes/sstate_readonly.bbclass

diff --git a/meta/classes/sstate_readonly.bbclass b/meta/classes/sstate_readonly.bbclass
new file mode 100644
index 0000000..488353d
--- /dev/null
+++ b/meta/classes/sstate_readonly.bbclass
@@ -0,0 +1,53 @@
+SSTATE_CHECK_FUNCTIONS_append = " sstate_readonly_check"
+# 1) The read-only sstate-cache will always be enabled if this bbclass
+#    inherited
+#
+# 2) If ${SSTATECACHE_WHITELIST} is "", it means always blacklist
+#    everything
+#
+# 3) Adding recipes to ${SSTATECACHE_WHITELIST} will allow only select
+#    recipes to be allowed to build
+#
+# 4) While recipes not in ${SSTATECACHE_WHITELIST}, an error will be
+#    generated if a recipe is not available within sstate-cache.
+SSTATECACHE_WHITELIST ?= ""
+
+python sstate_readonly_check(){
+    whitelist = (d.getVar('SSTATECACHE_WHITELIST', True) or '').split()
+    sq_fn = d.getVar('sq_fn', True) or []
+    missed = d.getVar('missed', True) or []
+    missed_pn = []
+    for task in missed:
+        fn = sq_fn[task]
+        data = bb.cache.Cache.loadDataFull(fn, '', d)
+        pn = data.getVar('PN', True)
+        if pn and pn not in missed_pn:
+            missed_pn.append(pn)
+
+    if missed_pn:
+        blacklist = [pn for pn in missed_pn if pn not in whitelist]
+        if blacklist:
+            msg =  'Read-only sstate-cache is enabled, the build of \n'
+            msg += '"' + ' '.join(blacklist) + '"\n'
+            msg += 'did not come from sstate-cache. Only the recipe listed in\n'
+            msg += 'SSTATECACHE_WHITELIST is allowed to build from source'
+            bb.fatal(msg)
+}
+
+def _sstate_readonly_clean_check(d):
+    whitelist = (d.getVar('SSTATECACHE_WHITELIST', True) or '').split()
+    pn = d.getVar('PN', True)
+    if pn not in whitelist:
+        msg =  'Read-only sstate-cache is enabled, the clean of \n'
+        msg += '%s is not allowed. Only the recipe listed in\n' % pn
+        msg += 'SSTATECACHE_WHITELIST is allowed to clean sstate-cache'
+        bb.fatal(msg)
+
+python do_cleansstate_prepend() {
+        _sstate_readonly_clean_check(d)
+}
+
+python do_cleanall_prepend() {
+    _sstate_readonly_clean_check(d)
+}
+
-- 
1.7.10.4

[PATCH 11/27] libxkbcommon: Add missing dependency on xkeyboard-config

[Ross Burton]

From: Mikhail Durnev <mikhail_durnev@mentor.com>

libxkbcommon depends on xkeyboard-config

Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
Signed-off-by: Abhijit Potnis <abhijit_potnis@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb
index 9b7b0c2..0dd2956 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb
@@ -17,4 +17,4 @@ inherit autotools pkgconfig
 EXTRA_OECONF = "--disable-docs"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb"
+PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb xkeyboard-config,"
-- 
1.7.10.4

[PATCH 12/27] gtk+2: update to 2.24.24

[Ross Burton]

From: Marko Lindqvist <cazfi74@gmail.com>

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch |    0
 ...o-584832-Duplicate-the-exec-string-returned-by-gtk.patch |    0
 .../{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch |    0
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch  |    0
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch  |    0
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch     |    0
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch   |    0
 .../{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch  |    0
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch |   11 ++++++-----
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff    |    0
 .../gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch     |    0
 .../recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} |    4 ++--
 12 files changed, 8 insertions(+), 7 deletions(-)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/cellrenderer-cairo.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configure-nm.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/configurefix.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/doc-fixes.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/entry-cairo.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/hardcoded_libtool.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/run-iconcache.patch (72%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/toggle-font.diff (100%)
 rename meta/recipes-gnome/gtk+/{gtk+-2.24.22 => gtk+-2.24.24}/xsettings.patch (100%)
 rename meta/recipes-gnome/gtk+/{gtk+_2.24.22.bb => gtk+_2.24.24.bb} (93%)

diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/cellrenderer-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/cellrenderer-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/configure-nm.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/configure-nm.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/configurefix.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/configurefix.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/doc-fixes.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/doc-fixes.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/entry-cairo.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/entry-cairo.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/hardcoded_libtool.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/hardcoded_libtool.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch
similarity index 72%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch
index 597ba32..a4e2254 100644
--- a/meta/recipes-gnome/gtk+/gtk+-2.24.22/run-iconcache.patch
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.24/run-iconcache.patch
@@ -1,21 +1,22 @@
 Upstream-Status: Inappropriate [configuration]
 
-Index: gtk+-2.21.2/gtk/Makefile.am
-===================================================================
---- gtk+-2.21.2.orig/gtk/Makefile.am	2010-06-22 17:21:41.000000000 +0800
-+++ gtk+-2.21.2/gtk/Makefile.am	2010-06-22 17:28:12.000000000 +0800
-@@ -1376,11 +1376,11 @@
+diff -Nurd gtk+-2.24.24/gtk/Makefile.am gtk+-2.24.24/gtk/Makefile.am
+--- gtk+-2.24.24/gtk/Makefile.am	2014-06-23 18:08:14.000000000 +0300
++++ gtk+-2.24.24/gtk/Makefile.am	2014-09-03 23:45:12.669307700 +0300
+@@ -1391,12 +1391,12 @@
  	   ./gtk-update-icon-cache
  endif
  
 -gtkbuiltincache.h: @REBUILD@ stamp-icons
 -	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 -	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
+-	   --include-image-data							\
 -	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
 -	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
 +#gtkbuiltincache.h: @REBUILD@ stamp-icons
 +#	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 +#	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
++#	   --include-image-data							\
 +#	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
 +#	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
  
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/toggle-font.diff
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/toggle-font.diff
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch
similarity index 100%
rename from meta/recipes-gnome/gtk+/gtk+-2.24.22/xsettings.patch
rename to meta/recipes-gnome/gtk+/gtk+-2.24.24/xsettings.patch
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.22.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb
similarity index 93%
rename from meta/recipes-gnome/gtk+/gtk+_2.24.22.bb
rename to meta/recipes-gnome/gtk+/gtk+_2.24.24.bb
index 98c65a5..7d0a0a2 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.22.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.24.bb
@@ -28,8 +28,8 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
 #        file://combo-arrow-size.patch;striplevel=0
 #            file://configurefix.patch
 
-SRC_URI[md5sum] = "5fbbfb7637bbd571a572a2dae0e736d2"
-SRC_URI[sha256sum] = "b114b6e9fb389bf3aa8a6d09576538f58dce740779653084046852fb4140ae7f"
+SRC_URI[md5sum] = "f80ac8aa95ea8482ad89656d0370752e"
+SRC_URI[sha256sum] = "12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d"
 
 EXTRA_OECONF = "--enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
 
-- 
1.7.10.4

[PATCH 13/27] libpng: drop unnecessary automake requirement lowering patch

[Ross Burton]

From: Marko Lindqvist <cazfi74@gmail.com>

Automake recipe provides automake 1.14.1 anyway

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...0001-configure-lower-automake-requirement.patch |   31 --------------------
 meta/recipes-multimedia/libpng/libpng_1.6.10.bb    |    1 -
 2 files changed, 32 deletions(-)
 delete mode 100644 meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch

diff --git a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch b/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
deleted file mode 100644
index bbbca89..0000000
--- a/meta/recipes-multimedia/libpng/libpng/0001-configure-lower-automake-requirement.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fff7cbc01e061a235852f385866fe75fb17867e3 Mon Sep 17 00:00:00 2001
-From: Valentin Popa <valentin.popa@intel.com>
-Date: Tue, 26 Nov 2013 12:06:55 +0200
-Subject: [PATCH] configure: lower automake requirement
-
-We're not using parallel tests in OE-core yet
-
-Signed-off-by: Valentin Popa <valentin.popa@intel.com>
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-Upstream-Status: Inapropriate [OE specific build hack]
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 28200c3..fab2515 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_CONFIG_MACRO_DIR([scripts])
- # dist-xz requires automake 1.11 or later
- # 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
- # 1.13 is required for parallel tests
--AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules subdir-objects])
-+AM_INIT_AUTOMAKE([1.12.2 foreign dist-xz color-tests silent-rules subdir-objects])
- # The following line causes --disable-maintainer-mode to be the default to
- # configure, this is necessary because libpng distributions cannot rely on the
- # time stamps of the autotools generated files being correct
--- 
-1.8.3.2
-
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
index babf87e..79d9122 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
@@ -9,7 +9,6 @@ DEPENDS = "zlib"
 LIBV = "16"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
-           file://0001-configure-lower-automake-requirement.patch \
           "
 
 SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768"
-- 
1.7.10.4

[PATCH 14/27] libpng: update to 1.6.13

[Ross Burton]

From: Marko Lindqvist <cazfi74@gmail.com>

License terms have not changed. In case of LICENSE and png.h lines 0-15
the version numbers and release dates have changed. In case of png.h lines
229-343 the text has not changed at all, but old line numbers were not
pointing to correctly to the licensing terms segment.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb}            |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename meta/recipes-multimedia/libpng/{libpng_1.6.10.bb => libpng_1.6.13.bb} (62%)

diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
similarity index 62%
rename from meta/recipes-multimedia/libpng/libpng_1.6.10.bb
rename to meta/recipes-multimedia/libpng/libpng_1.6.13.bb
index 79d9122..0c6fd1f 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.10.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.13.bb
@@ -2,17 +2,17 @@ SUMMARY = "PNG image format decoding library"
 HOMEPAGE = "http://www.libpng.org/"
 SECTION = "libs"
 LICENSE = "Libpng"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cb7a834ba2891bc30b8577e49963a435 \
-                    file://png.h;endline=15;md5=853b11c4a19ec66decd641efd756bc2c \
-                    file://png.h;beginline=209;endline=323;md5=cface34a7db6b71eaa828fe934951f81"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=46401ee4b225b9ec066cb96cf1025c0f \
+                    file://png.h;endline=15;md5=8167a17735fc618d1df109f8b0f839a6 \
+                    file://png.h;beginline=229;endline=343;md5=5cdf8564a14e2f00339e4437a83b4913"
 DEPENDS = "zlib"
 LIBV = "16"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz \
           "
 
-SRC_URI[md5sum] = "5f414b20f683b1d96b163c89e3eff768"
-SRC_URI[sha256sum] = "4003f0fd0e36110a2b742fc5b9e1ab93ed7a7ab57ae8dc65f0e8101458775a56"
+SRC_URI[md5sum] = "9822c25466f060142359f80ed142c9e5"
+SRC_URI[sha256sum] = "d9c8ce54a5fc8052ed794ca65b553384a74c0608b09ae163cbbb07176018e625"
 
 BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config"
 
-- 
1.7.10.4

[PATCH 15/27] pango: update to 1.36.6

[Ross Burton]

From: Marko Lindqvist <cazfi74@gmail.com>

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/pango/{pango_1.36.5.bb => pango_1.36.6.bb} (56%)

diff --git a/meta/recipes-graphics/pango/pango_1.36.5.bb b/meta/recipes-graphics/pango/pango_1.36.6.bb
similarity index 56%
rename from meta/recipes-graphics/pango/pango_1.36.5.bb
rename to meta/recipes-graphics/pango/pango_1.36.6.bb
index 5c20497..61ae359 100644
--- a/meta/recipes-graphics/pango/pango_1.36.5.bb
+++ b/meta/recipes-graphics/pango/pango_1.36.6.bb
@@ -8,5 +8,5 @@ SRC_URI += "file://run-ptest \
             file://multilib-fix-clean.patch \
 "
 
-SRC_URI[archive.md5sum] = "2500930093c3ed38acb40e4255bce2f1"
-SRC_URI[archive.sha256sum] = "be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8"
\ No newline at end of file
+SRC_URI[archive.md5sum] = "1c27523c3f3a4efe4d9d303d0d240320"
+SRC_URI[archive.sha256sum] = "4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624"
\ No newline at end of file
-- 
1.7.10.4

[PATCH 16/27] gtk+3: update to 3.12.2

[Ross Burton]

From: Marko Lindqvist <cazfi74@gmail.com>

fix-build-when-wayland-backend-enabled.patch removed as the issue
is fixed in upstream.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-gnome/gtk+/gtk+3.inc                  |    6 ++-
 .../fix-build-when-wayland-backend-enabled.patch   |   43 --------------------
 .../gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb}      |    5 +--
 3 files changed, 7 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
 rename meta/recipes-gnome/gtk+/{gtk+3_3.10.7.bb => gtk+3_3.12.2.bb} (75%)

diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 9e96275..54ca77a 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -49,7 +49,11 @@ LIBV = "3.0.0"
 FILES_${PN}-demo = "${bindir}/gtk3-demo \
                     ${bindir}/gtk3-demo-application \
                     ${bindir}/gtk3-widget-factory \
-                    ${datadir}/gtk-3.0/demo"
+                    ${datadir}/gtk-3.0/demo \
+                    ${datadir}/applications/gtk3-demo.desktop \
+                    ${datadir}/applications/gtk3-widget-factory.desktop \
+                    ${datadir}/icons/hicolor/*/apps/gtk3-demo.png \
+                    ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory.png"
 
 # The demo uses PNG files and mime type sniffing, so ensure that these
 # dependencies are present.
diff --git a/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch b/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
deleted file mode 100644
index b4b1a09..0000000
--- a/meta/recipes-gnome/gtk+/gtk+3/fix-build-when-wayland-backend-enabled.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix build when wayland backend enabled
-
-Upstream-Status: Submitted
-https://bugzilla.gnome.org/show_bug.cgi?id=710584
-
-Author: Emilio Pozuelo Monfort
-
---- gtk+-3.10.7/gtk/gtkapplication.c
-+++ gtk+-3.10.7/gtk/gtkapplication.c
-@@ -144,7 +144,6 @@
- 
-   gboolean register_session;
- 
--#ifdef GDK_WINDOWING_X11
-   guint next_id;
- 
-   GDBusConnection *session_bus;
-@@ -161,7 +160,6 @@
-   GDBusProxy *client_proxy;
-   gchar *app_id;
-   gchar *client_path;
--#endif
- 
- #ifdef GDK_WINDOWING_QUARTZ
-   GMenu *combined;
-@@ -299,6 +297,8 @@
-   g_free (application->priv->client_path);
- }
- 
-+#endif
-+
- const gchar *
- gtk_application_get_app_menu_object_path (GtkApplication *application)
- {
-@@ -311,8 +311,6 @@
-   return application->priv->menubar_path;
- }
- 
--#endif
--
- #ifdef GDK_WINDOWING_QUARTZ
- 
- typedef struct {
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb b/meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb
similarity index 75%
rename from meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
rename to meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb
index d0174f6..f4f1971 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.10.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.12.2.bb
@@ -4,12 +4,11 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
            file://hardcoded_libtool.patch \
-           file://fix-build-when-wayland-backend-enabled.patch \
            file://fix-flags-for-native.patch \
           "
 
-SRC_URI[md5sum] = "18a81944a8506231529a76bf2b68372b"
-SRC_URI[sha256sum] = "b7e9de15385031cff43897e7e59f6692eaabf500f36eef80e6b9d6486ad49427"
+SRC_URI[md5sum] = "0d6d8f9f79132b3b47475d047b369b1c"
+SRC_URI[sha256sum] = "61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
-- 
1.7.10.4

[PATCH 17/27] pixman: upgrade to 0.32.6

[Ross Burton]

Revert a patch to the MIPS-specific code that was causing compile failures.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../xorg-lib/pixman/mips-export-revert.patch       |   22 ++++++++++++++++++++
 .../{pixman_0.32.4.bb => pixman_0.32.6.bb}         |    5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
 rename meta/recipes-graphics/xorg-lib/{pixman_0.32.4.bb => pixman_0.32.6.bb} (86%)

diff --git a/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
new file mode 100644
index 0000000..14a5fd2
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch
@@ -0,0 +1,22 @@
+Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with
+errors such as:
+
+pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267:
+Error: invalid operands `mflo $14,$ac3'
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+--- b/pixman/pixman-mips-dspr2-asm.h
++++ a/pixman/pixman-mips-dspr2-asm.h
+@@ -72,10 +72,7 @@
+ #define LEAF_MIPS32R2(symbol)                           \
+                 .globl  symbol;                         \
+                 .align  2;                              \
+-#ifdef __ELF__
+-                .hidden symbol;                         \
+                 .type   symbol, @function;              \
+-#endif
+                 .ent    symbol, 0;                      \
+ symbol:         .frame  sp, 0, ra;                      \
+                 .set    push;                           \
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
similarity index 86%
rename from meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
index 51cca5d..467ba50 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.32.4.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb
@@ -29,9 +29,10 @@ EXTRA_OECONF_class-native = "--disable-gtk"
 
 SRC_URI += "\
             file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
+            file://mips-export-revert.patch \
 "
 
-SRC_URI[md5sum] = "cdb566504fe9daf6728c7b03cc7ea228"
-SRC_URI[sha256sum] = "ae2bd664057e330d41b40336ed296d3512318ce7f2401cc42601f2613d371e4c"
+SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344"
+SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4"
 
 REQUIRED_DISTRO_FEATURES = ""
-- 
1.7.10.4

[PATCH 18/27] os-release: Adding a new recipe for operating system identification

[Ross Burton]

From: Sujith H <Sujith_Haridasan@mentor.com>

The /etc/os-release will have the operating system identification data.
Tested on target with systemd enabled. Here is the sample file looks
in the file:

ID=poky-ivi-systemd
NAME=Yocto GENIVI Baseline (Poky/meta-ivi)
VERSION=6.0+snapshot-20140721 (daisy)
VERSION_ID=6.0+snapshot-20140721
PRETTY_NAME=Yocto GENIVI Baseline (Poky/meta-ivi) 6.0+snapshot-20140721 (daisy)

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/os-release/os-release.bb |   36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 meta/recipes-core/os-release/os-release.bb

diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb
new file mode 100644
index 0000000..33e9581
--- /dev/null
+++ b/meta/recipes-core/os-release/os-release.bb
@@ -0,0 +1,36 @@
+inherit allarch
+
+SUMMARY = "Operating system identification"
+DESCRIPTION = "The /etc/os-release file contains operating system identification data."
+LICENSE = "MIT"
+INHIBIT_DEFAULT_DEPS = "1"
+
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+
+# Other valid fields: BUILD_ID ID_LIKE ANSI_COLOR CPE_NAME
+#                     HOME_URL SUPPORT_URL BUG_REPORT_URL
+OS_RELEASE_FIELDS = "ID ID_LIKE NAME VERSION VERSION_ID PRETTY_NAME"
+
+ID = "${DISTRO}"
+NAME = "${DISTRO_NAME}"
+VERSION = "${DISTRO_VERSION}${@' (%s)' % DISTRO_CODENAME if 'DISTRO_CODENAME' in d else ''}"
+VERSION_ID = "${DISTRO_VERSION}"
+PRETTY_NAME = "${DISTRO_NAME} ${VERSION}"
+BUILD_ID ?= "${DATETIME}"
+
+python do_compile () {
+    with open(d.expand('${B}/os-release'), 'w') as f:
+        for field in d.getVar('OS_RELEASE_FIELDS', True).split():
+            value = d.getVar(field, True)
+            if value:
+                f.write('{0}={1}\n'.format(field, value))
+}
+do_compile[vardeps] += "${OS_RELEASE_FIELDS}"
+
+do_install () {
+    install -d ${D}${sysconfdir}
+    install -m 0644 os-release ${D}${sysconfdir}/
+}
-- 
1.7.10.4

[PATCH 19/27] systemd: Adding RRECOMMENDS for os-release

[Ross Burton]

From: Sujith H <Sujith_Haridasan@mentor.com>

Systemd depends on the os-release hence adding
RRECOMMENDS for the systemd package.

[ RB - updated for 216 ]

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Sujith H <Sujith_Haridasan@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-core/systemd/systemd_216.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index a7fd71e..b941853 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -270,7 +270,7 @@ RDEPENDS_${PN} += "volatile-binds"
 RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units udev-hwdb\
                       util-linux-agetty \
                       util-linux-fsck e2fsprogs-e2fsck \
-                      kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \
+                      kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 os-release \
 "
 
 PACKAGES =+ "udev-dbg udev udev-hwdb"
-- 
1.7.10.4

[PATCH 20/27] alsa-utils: upgrade to 1.0.28

[Ross Burton]

From: Cristian Iorga <cristian.iorga@intel.com>

Changelog:
http://www.alsa-project.org/main/index.php/Changes_v1.0.27.2_v1.0.28

0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch updated.

(From OE-Core rev: 5a3331b7ee8bb565ebb3823fc23123120ccd653d)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index 2d23482..d6b24f1 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -11,7 +11,7 @@ PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
 PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/${BP}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
           "
 
-- 
1.7.10.4

[PATCH 21/27] bluez5: Allow method calls over dbus for bluetooth daemon

[Ross Burton]

From: Yasir-Khan <yasir_khan@mentor.com>

This patch changes the dbus policy settings in order to allow
calling methods over dbus. bluez5 and pulseaudio rely on this
mechanism to configure media end points. Previously bluetoothd
was failing to configure the media end points with error
org.freedesktop.DBus.Error.AccessDenied, due to which bluetooth
headset and smartphone were unable to connect in A2DP mode.

Signed-off-by: Yasir-Khan <yasir_khan@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf |    1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf b/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
index e21e72e..26845bb 100644
--- a/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
+++ b/meta/recipes-connectivity/bluez5/bluez5/bluetooth.conf
@@ -11,6 +11,7 @@
     <allow own="org.bluez"/>
     <allow send_destination="org.bluez"/>
     <allow send_interface="org.bluez.Agent1"/>
+    <allow send_type="method_call"/>
   </policy>
 
 </busconfig>
-- 
1.7.10.4

[PATCH 22/27] gstreamer: Set DEPENDS dynamically for plugins-ugly and plugins-bad

[Ross Burton]

From: Drew Moseley <drew_moseley@mentor.com>

Only add plugins-ugly or plugins-bad to the DEPENDS if they are
added to the COMMERCIAL_AUDIO_PLUGINS or COMMERCIAL_VIDEO_PLUGINS.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb     |    7 ++++++-
 meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb |    5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 518ab72..039abe1 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -1,6 +1,11 @@
 SUMMARY = "GStreamer package groups"
 LICENSE = "MIT"
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad"
+
+COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}"
+DEPENDS_UGLY="${@'gst-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
+DEPENDS_BAD="${@'gst-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
+DEPENDS = "gstreamer gst-plugins-base gst-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}"
+
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
index a703d9b..3ef10c3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
@@ -3,7 +3,10 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad"
+COMMERCIAL_PLUGINS = "${COMMERCIAL_AUDIO_PLUGINS} ${COMMERCIAL_VIDEO_PLUGINS}"
+DEPENDS_UGLY="${@'gstreamer1.0-plugins-ugly' if 'ugly' in COMMERCIAL_PLUGINS.split('-') else ''}"
+DEPENDS_BAD="${@'gstreamer1.0-plugins-bad' if 'bad' in COMMERCIAL_PLUGINS.split('-') else ''}"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good ${DEPENDS_UGLY} ${DEPENDS_BAD}"
 
 PACKAGES = "\
     gstreamer1.0-meta-base \
-- 
1.7.10.4

[PATCH 23/27] python-native: disable user site support

[Ross Burton]

From: Yasir-Khan <yasir_khan@mentor.com>

The user site-packages gets inserted into sys.path ahead of the
system site directories, so a site package installed there will
be used in preference to what's in our sysroot, causing less
deterministic builds, and potential build breakage, depending
on what the user has installed there. Disable it for our native
python, so they don't affect our builds.

Signed-off-by: Christopher Larson <kergoth@gmail.com>
Signed-off-by: Yasir-Khan <yasir_khan@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/python/python-native_2.7.3.bb |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 827654d..e55f5fe 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -58,4 +58,8 @@ do_install() {
 	# (these often end up too long for the #! parser in the kernel as the
 	# buffer is 128 bytes long).
 	ln -s python-native/python ${D}${bindir}/nativepython
+	
+	# We don't want modules in ~/.local being used in preference to those
+	# installed in the native sysroot, so disable user site support.
+	sed -i -e 's,^\(ENABLE_USER_SITE = \).*,\1False,' ${D}${libdir}/python${PYTHON_MAJMIN}/site.py
 }
-- 
1.7.10.4

[PATCH 24/27] glib-2.0: fix mount detection

[Ross Burton]

From: Marius Avram <marius.avram@intel.com>

Currently a USB stick gets mounted on /run/media/sdX, where X is the
letter corresponding to a certain drive. In older builds of core-image-sato
it got mounted in /media/sdX. This change made the drives to not be
displayed in graphical applications which use glib-2.0 such as the
File Manager (pcmanfm). The reason is that the gio component of glib-2.0
which handles mounts contains a function which determines if a mount
is worthy to be displayed in the UI or not. The function is called
g_unix_mount_guess_should_display().

It expects a drive to be mounted in /run/media/<username>/sdX, but
in the current build the username part is missing in case a root user
is authenticated in the system.

The easiest solution is to allow the display of drives mounted in the
path used by the current configuration and that is /run/media/sdX.

[YOCTO #6492]

Signed-off-by: Marius Avram <marius.avram@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...un-media-sdX-drive-mount-if-username-root.patch |   39 ++++++++++++++++++++
 meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb      |    1 +
 2 files changed, 40 insertions(+)
 create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
new file mode 100644
index 0000000..3d0c008
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch
@@ -0,0 +1,39 @@
+From c53e94a520b573aa0dcf12903e9563fe8badc34c Mon Sep 17 00:00:00 2001
+From: Marius Avram <marius.avram@intel.com>
+Date: Wed, 27 Aug 2014 12:10:41 +0300
+Subject: [PATCH] Allow /run/media/sdX drive mount if username root
+
+In case that the username logged in the system is root
+the drives are directly mounted in /run/media/sdX and
+not /run/media/<username>/sdX as the function
+g_unix_mount_guess_should_display() expects.
+
+Without this change USB stick mounts are not accesible from
+graphical applications such as the File Manager (pcmanfm).
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Marius Avram <marius.avram@intel.com>
+---
+ gio/gunixmounts.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
+index 4999354..f6c1472 100644
+--- a/gio/gunixmounts.c
++++ b/gio/gunixmounts.c
+@@ -2136,6 +2136,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry)
+           mount_path[sizeof ("/run/media/") - 1 + user_name_len] == '/')
+         is_in_runtime_dir = TRUE;
+ 
++      /* Allow no username in path in /run/media if current user is root */
++      if (strcmp(user_name, "root") == 0 &&
++          strncmp (mount_path, "/run/media/", sizeof("run/media")) == 0)
++        is_in_runtime_dir = TRUE;
++
+       if (is_in_runtime_dir || g_str_has_prefix (mount_path, "/media/"))
+         {
+           char *path;
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
index ff1fb87..4b1bcf8 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.40.0.bb
@@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://ptest-paths.patch \
            file://uclibc.patch \
            file://0001-configure.ac-Do-not-use-readlink-when-cross-compilin.patch \
+           file://allow-run-media-sdX-drive-mount-if-username-root.patch \
           "
 
 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
-- 
1.7.10.4

[PATCH 25/27] shadow: add Qualcomm and STMicroelectronics SoCs

[Ross Burton]

From: Fathi Boudra <fathi.boudra@linaro.org>

Reported-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Reported-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/shadow/files/securetty |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/meta/recipes-extended/shadow/files/securetty b/meta/recipes-extended/shadow/files/securetty
index d919993..7fecda1 100644
--- a/meta/recipes-extended/shadow/files/securetty
+++ b/meta/recipes-extended/shadow/files/securetty
@@ -14,12 +14,27 @@ ttyAMA1
 ttyAMA2
 ttyAMA3
 
+# QCOM Socs
+ttyHSL0
+ttyHSL1
+ttyHSL2
+ttyHSL3
+ttyMSM0
+ttyMSM1
+ttyMSM2
+
 # Samsung ARM SoCs
 ttySAC0
 ttySAC1
 ttySAC2
 ttySAC3
 
+# STM SoCs
+ttyAS0
+ttyAS1
+ttyAS2
+ttyAS3
+
 # TI OMAP SoCs
 ttyO0
 ttyO1
-- 
1.7.10.4

[PATCH 26/27] qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

[Ross Burton]

From: Martin Jansa <martin.jansa@gmail.com>

* in some cases (e.g. with external toolchain which doesn't respect our
  reasonably old version set in OLDEST_KERNEL) it's possible to have libc
  which requires newer kernel than what we have on builders, qemu supports
  -r param to use different uname than what's returned by host system.
* change qemu_run_binary to pass -r ${OLDEST_KERNEL} and add the same to
  QEMU_OPTIONS which are used by qemuwrapper-cross
* maybe we should eventually convert all qemu_run_binary usages always include
  qemuwrapper-cross dependency and always call qemu through that (it
  seems very strange that qemu_target_binary is called from qemuwrapper
  and for allarch recipes it can return qemu-allarch as qemu binary).

  qemu_run_binary is used by:
  meta/classes/gtk-immodules-cache.bbclass:            ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \
  meta/classes/qemu.bbclass:def qemu_run_binary(data, rootfs_path, binary):
  meta/recipes-core/systemd/systemd_213.bb:         ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \
  meta/recipes-graphics/pango/pango.inc:    ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \

  and qemuwrapper directly by:
  scripts/postinst-intercepts/update_font_cache:PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
  scripts/postinst-intercepts/update_pixbuf_cache:PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/qemu.bbclass |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index abee8aa..b2cf85d 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -29,19 +29,20 @@ def qemu_run_binary(data, rootfs_path, binary):
 
     libdir = rootfs_path + data.getVar("libdir", False)
     base_libdir = rootfs_path + data.getVar("base_libdir", False)
+    oldest_kernel = data.getVar("OLDEST_KERNEL", True)
 
-    return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
+    return "PSEUDO_UNLOAD=1 " + qemu_binary + " -r " + oldest_kernel + " -L " + rootfs_path\
             + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
             + rootfs_path + binary
 
-QEMU_OPTIONS = ""
-QEMU_OPTIONS_iwmmxt    = "-cpu pxa270-c5"
-QEMU_OPTIONS_armv6     = "-cpu arm1136"
-QEMU_OPTIONS_armv7a    = "-cpu cortex-a8"
-QEMU_OPTIONS_e500v2    = "-cpu e500v2"
-QEMU_OPTIONS_e500mc    = "-cpu e500mc"
-QEMU_OPTIONS_e5500     = "-cpu e5500"
-QEMU_OPTIONS_e5500-64b = "-cpu e5500"
-QEMU_OPTIONS_e6500     = "-cpu e6500"
-QEMU_OPTIONS_e6500-64b = "-cpu e6500"
-QEMU_OPTIONS_ppc7400   = "-cpu 7400"
+QEMU_OPTIONS = "-r ${OLDEST_KERNEL}"
+QEMU_OPTIONS_append_iwmmxt    = " -cpu pxa270-c5"
+QEMU_OPTIONS_append_armv6     = " -cpu arm1136"
+QEMU_OPTIONS_append_armv7a    = " -cpu cortex-a8"
+QEMU_OPTIONS_append_e500v2    = " -cpu e500v2"
+QEMU_OPTIONS_append_e500mc    = " -cpu e500mc"
+QEMU_OPTIONS_append_e5500     = " -cpu e5500"
+QEMU_OPTIONS_append_e5500-64b = " -cpu e5500"
+QEMU_OPTIONS_append_e6500     = " -cpu e6500"
+QEMU_OPTIONS_append_e6500-64b = " -cpu e6500"
+QEMU_OPTIONS_append_ppc7400   = " -cpu 7400"
-- 
1.7.10.4

[PATCH 27/27] alsa-utils: hard-code alsa-utils in SRC_URI

[Ross Burton]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

This recipe is used by alsa-utils-alsaconf so don't use ${BP} in the SRC_URI.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
index d6b24f1..2d23482 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.28.bb
@@ -11,7 +11,7 @@ PACKAGECONFIG ??= "udev"
 PACKAGECONFIG[udev] = "--with-udev-rules-dir=`pkg-config --variable=udevdir udev`/rules.d,,udev"
 PACKAGECONFIG[xmlto] = "--enable-xmlto, --disable-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/${BP}.tar.bz2 \
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch \
           "
 
-- 
1.7.10.4

Re: [PATCH 26/27] qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

[Andreas Müller]

[-- Attachment #1: Type: text/plain, Size: 2052 bytes --]

On Mon, Sep 8, 2014 at 1:58 PM, Ross Burton <ross.burton@intel.com> wrote:

> From: Martin Jansa <martin.jansa@gmail.com>
>
> * in some cases (e.g. with external toolchain which doesn't respect our
>   reasonably old version set in OLDEST_KERNEL) it's possible to have libc
>   which requires newer kernel than what we have on builders, qemu supports
>   -r param to use different uname than what's returned by host system.
> * change qemu_run_binary to pass -r ${OLDEST_KERNEL} and add the same to
>   QEMU_OPTIONS which are used by qemuwrapper-cross
> * maybe we should eventually convert all qemu_run_binary usages always
> include
>   qemuwrapper-cross dependency and always call qemu through that (it
>   seems very strange that qemu_target_binary is called from qemuwrapper
>   and for allarch recipes it can return qemu-allarch as qemu binary).
>
>   qemu_run_binary is used by:
>   meta/classes/gtk-immodules-cache.bbclass:
> ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \
>   meta/classes/qemu.bbclass:def qemu_run_binary(data, rootfs_path, binary):
>   meta/recipes-core/systemd/systemd_213.bb:         ${@qemu_run_binary(d,
> '$D', '${base_bindir}/udevadm')} hwdb --update \
>   meta/recipes-graphics/pango/pango.inc:    ${@qemu_run_binary(d,
> '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
>
>   and qemuwrapper directly by:
>   scripts/postinst-intercepts/update_font_cache:PSEUDO_UNLOAD=1
> qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
>   scripts/postinst-intercepts/update_pixbuf_cache:PSEUDO_UNLOAD=1
> qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
>
> Somehow related but I don't understand fully yet:

do_rootfs complains:
NOTE: > Executing update_pixbuf_cache intercept ...
FATAL: kernel too old
WARNING: The postinstall intercept hook 'update_pixbuf_cache' failed (exit
code: 127)! See log for details!

and many other 'kernel too old' messages. Target kernel is 3.14.19 / Host
is 3.14.17. Too old?

Andreas

[-- Attachment #2: Type: text/html, Size: 2722 bytes --]

Re: [PATCH 26/27] qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2353 bytes --]

On Thu, Oct 02, 2014 at 11:22:11AM +0200, Andreas Müller wrote:
> On Mon, Sep 8, 2014 at 1:58 PM, Ross Burton <ross.burton@intel.com> wrote:
> 
> > From: Martin Jansa <martin.jansa@gmail.com>
> >
> > * in some cases (e.g. with external toolchain which doesn't respect our
> >   reasonably old version set in OLDEST_KERNEL) it's possible to have libc
> >   which requires newer kernel than what we have on builders, qemu supports
> >   -r param to use different uname than what's returned by host system.
> > * change qemu_run_binary to pass -r ${OLDEST_KERNEL} and add the same to
> >   QEMU_OPTIONS which are used by qemuwrapper-cross
> > * maybe we should eventually convert all qemu_run_binary usages always
> > include
> >   qemuwrapper-cross dependency and always call qemu through that (it
> >   seems very strange that qemu_target_binary is called from qemuwrapper
> >   and for allarch recipes it can return qemu-allarch as qemu binary).
> >
> >   qemu_run_binary is used by:
> >   meta/classes/gtk-immodules-cache.bbclass:
> > ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \
> >   meta/classes/qemu.bbclass:def qemu_run_binary(data, rootfs_path, binary):
> >   meta/recipes-core/systemd/systemd_213.bb:         ${@qemu_run_binary(d,
> > '$D', '${base_bindir}/udevadm')} hwdb --update \
> >   meta/recipes-graphics/pango/pango.inc:    ${@qemu_run_binary(d,
> > '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
> >
> >   and qemuwrapper directly by:
> >   scripts/postinst-intercepts/update_font_cache:PSEUDO_UNLOAD=1
> > qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> >   scripts/postinst-intercepts/update_pixbuf_cache:PSEUDO_UNLOAD=1
> > qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> >
> > Somehow related but I don't understand fully yet:
> 
> do_rootfs complains:
> NOTE: > Executing update_pixbuf_cache intercept ...
> FATAL: kernel too old
> WARNING: The postinstall intercept hook 'update_pixbuf_cache' failed (exit
> code: 127)! See log for details!
> 
> and many other 'kernel too old' messages. Target kernel is 3.14.19 / Host
> is 3.14.17. Too old?

What is your OLDEST_KERNEL value? and what does "file" show as required
kernel on those binaries?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 26/27] qemu.bbclass: add -r ${OLDEST_KERNEL} parameter

[Andreas Müller]

[-- Attachment #1: Type: text/plain, Size: 2610 bytes --]

On Thu, Oct 2, 2014 at 5:05 PM, Martin Jansa <martin.jansa@gmail.com> wrote:

> On Thu, Oct 02, 2014 at 11:22:11AM +0200, Andreas Müller wrote:
> > On Mon, Sep 8, 2014 at 1:58 PM, Ross Burton <ross.burton@intel.com>
> wrote:
> >
> > > From: Martin Jansa <martin.jansa@gmail.com>
> > >
> > > * in some cases (e.g. with external toolchain which doesn't respect our
> > >   reasonably old version set in OLDEST_KERNEL) it's possible to have
> libc
> > >   which requires newer kernel than what we have on builders, qemu
> supports
> > >   -r param to use different uname than what's returned by host system.
> > > * change qemu_run_binary to pass -r ${OLDEST_KERNEL} and add the same
> to
> > >   QEMU_OPTIONS which are used by qemuwrapper-cross
> > > * maybe we should eventually convert all qemu_run_binary usages always
> > > include
> > >   qemuwrapper-cross dependency and always call qemu through that (it
> > >   seems very strange that qemu_target_binary is called from qemuwrapper
> > >   and for allarch recipes it can return qemu-allarch as qemu binary).
> > >
> > >   qemu_run_binary is used by:
> > >   meta/classes/gtk-immodules-cache.bbclass:
> > > ${@qemu_run_binary(d, '$D',
> '${bindir}/gtk-query-immodules-$maj_ver.0')} \
> > >   meta/classes/qemu.bbclass:def qemu_run_binary(data, rootfs_path,
> binary):
> > >   meta/recipes-core/systemd/systemd_213.bb:
>  ${@qemu_run_binary(d,
> > > '$D', '${base_bindir}/udevadm')} hwdb --update \
> > >   meta/recipes-graphics/pango/pango.inc:    ${@qemu_run_binary(d,
> > > '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
> > >
> > >   and qemuwrapper directly by:
> > >   scripts/postinst-intercepts/update_font_cache:PSEUDO_UNLOAD=1
> > > qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> > >   scripts/postinst-intercepts/update_pixbuf_cache:PSEUDO_UNLOAD=1
> > > qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
> > >
> > > Somehow related but I don't understand fully yet:
> >
> > do_rootfs complains:
> > NOTE: > Executing update_pixbuf_cache intercept ...
> > FATAL: kernel too old
> > WARNING: The postinstall intercept hook 'update_pixbuf_cache' failed
> (exit
> > code: 127)! See log for details!
> >
> > and many other 'kernel too old' messages. Target kernel is 3.14.19 / Host
> > is 3.14.17. Too old?
>
> What is your OLDEST_KERNEL value? and what does "file" show as required
> kernel on those binaries?
>
>
> Thanks: Angstrom sets 2.6.16 and file says 'for GNU/Linux 2.6.32'. Will
send out a patch to angstrom after testing

Andreas

[-- Attachment #2: Type: text/html, Size: 3628 bytes --]