Merge remote-tracking branch 'origin/fido' into dev

* origin/fido: (36 commits)
  qt5: update submodules
  b2qt-demos: update revision
  b2qt-appcontroller: update revision
  qt5: move mingw32 specific parts from meta-qt5
  qt5: Use latest version of meta-qt5
  b2qt-demos: update to new revision
  ostree: Mount boot partition from user space
  ostree: Do not use grub2-mkconfig.
  RPi2: add support for touch display
  Disable ethernet over usb on beaglebone.
  qtwayland: update SRCREV
  Move default sstate-cache dir from build dir
  Use distro specific sstate cache
  qtquickcompiler: add support for BYOS builds
  qtcharts: update revision
  qt5: update submodules
  democompositor: use correct path the SDK sources
  b2qt-demos: update SRCREV
  Add git SHA1 to b2qt addon package versions
  b2qt-utils: update SRCREV
  ...

Conflicts:
	recipes-qt/qt5/qtconnectivity_git.bbappend

Change-Id: I1c090c8f87e43664971e0381b93ccad5e4e48175

8 files changed, 323 insertions, 65 deletions

diff --git a/recipes/dracut/dracut_git.bbappend b/recipes/dracut/dracut_git.bbappend
index e33637a..ca3437c 100644
--- a/recipes/dracut/dracut_git.bbappend
+++ b/recipes/dracut/dracut_git.bbappend
@@ -19,6 +19,10 @@
 ##
 ##############################################################################
 
+PV = "044+git${SRCREV}"
+SRCREV = "1bc3e733f96033a508841e97fe08da7a12851782"
+SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http"
+
 # Upstream recipe mistakenly depends on systemd, we remove that dependency here.
 RDEPENDS_${PN}_remove = "systemd"
 REQUIRED_DISTRO_FEATURES_remove = "systemd"
diff --git a/recipes/initramfs-basic/files/init.sh b/recipes/initramfs-basic/files/init.sh
new file mode 100644
index 0000000..3db235b
--- /dev/null
+++ b/recipes/initramfs-basic/files/init.sh
@@ -0,0 +1,102 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+ROOT_MOUNT="/sysroot/"
+ROOT_DEVICE=""
+
+early_setup() {
+
+    mkdir -p /proc
+    mkdir -p /sys
+    mount -t proc proc /proc
+    mount -t sysfs sysfs /sys
+    mount -t devtmpfs none /dev
+
+    mkdir -p /run
+    mkdir -p /var/run
+}
+
+read_args() {
+
+    for arg in $(cat /proc/cmdline); do
+        value=$(echo ${arg} | cut -s -f2- -d '=')
+        case $arg in
+            root=*)
+                root=$value
+                ;;
+            debugshell*)
+                if [ -z "$value" ]; then
+                     shelltimeout=30
+                else
+                     shelltimeout=$value
+                fi
+                ;;
+        esac
+    done
+
+    if [ -z "$root" ] ; then
+        debug_shell "No root= specified via kernel command line."
+    else
+        case $root in
+            LABEL=*)
+                label=${root#LABEL=}
+                ;;
+            *)
+                debug_shell "This init script only supports root=LABEL=* for specifying root file system, but root=$root was provided."
+                ;;
+        esac
+    fi
+}
+
+mount_rootfs() {
+
+    mkdir -p $ROOT_MOUNT
+    mount $ROOT_DEVICE $ROOT_MOUNT
+    mount -n --move /proc $ROOT_MOUNT/proc
+    mount -n --move /sys $ROOT_MOUNT/sys
+    mount -n --move /dev $ROOT_MOUNT/dev
+
+    exec switch_root $ROOT_MOUNT /sbin/init || debug_shell "Couldn't switch_root."
+}
+
+switch_real_root() {
+
+    echo "Searching for media..."
+    C=0
+    while true
+    do
+
+    rootfs=$(findfs LABEL=$label)
+    if [ -n "$rootfs" ] ; then
+        ROOT_DEVICE=$rootfs
+        mount_rootfs
+    fi
+
+    # don't wait for more than $shelltimeout seconds, if it's set
+    if [ -n "$shelltimeout" ]; then
+        echo -n " " $(( $shelltimeout - $C ))
+        if [ $C -ge $shelltimeout ]; then
+            debug_shell "Cannot find root file system."
+        fi
+        C=$(( C + 1 ))
+    fi
+
+    sleep 1
+    done
+}
+
+debug_shell() {
+
+    echo ${1}
+    echo "Dropping to a shell."
+    exec sh
+}
+
+main() {
+
+    early_setup
+    read_args
+    switch_real_root
+}
+
+main
diff --git a/recipes/initramfs-basic/init-basic.bb b/recipes/initramfs-basic/init-basic.bb
new file mode 100644
index 0000000..674e683
--- /dev/null
+++ b/recipes/initramfs-basic/init-basic.bb
@@ -0,0 +1,34 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+SUMMARY = "Simple init script that mounts root filesystem by label."
+LICENSE = "CLOSED"
+SRC_URI = "file://init.sh"
+
+S = "${WORKDIR}"
+
+do_install () {
+    install -m 0755 ${WORKDIR}/init.sh ${D}/init
+}
+
+inherit allarch
+
+FILES_${PN} += "/init"
diff --git a/recipes/initramfs-basic/initramfs-basic.bb b/recipes/initramfs-basic/initramfs-basic.bb
new file mode 100644
index 0000000..4bef9c8
--- /dev/null
+++ b/recipes/initramfs-basic/initramfs-basic.bb
@@ -0,0 +1,40 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+DESCRIPTION = "Basic initramfs image. Useful as a template for more advanced functionality."
+LICENSE = "CLOSED"
+
+# findfs from busybox fails to do its jobs, the full version from util-linux-findfs works fine
+PACKAGE_INSTALL = "init-basic busybox util-linux-findfs ${ROOTFS_BOOTSTRAP_INSTALL}"
+
+# Do not pollute the initramfs image with rootfs features
+IMAGE_FEATURES = ""
+
+export IMAGE_BASENAME = "initramfs-basic"
+IMAGE_LINGUAS = ""
+
+IMAGE_FSTYPES = "cpio.gz"
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+
+BAD_RECOMMENDATIONS += "busybox-syslog"
+
diff --git a/recipes/os-release/os-release.bbappend b/recipes/os-release/os-release.bbappend
new file mode 100644
index 0000000..98e2d16
--- /dev/null
+++ b/recipes/os-release/os-release.bbappend
@@ -0,0 +1,39 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+# Reported upstream https://bugzilla.yoctoproject.org/show_bug.cgi?id=9144
+python do_fix_quotes () {
+    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_verify_if_fixed_by_upstream () {
+    pretty_name_first_char=$(cat ${B}/os-release | grep "^PRETTY_NAME" | cut -f 2 -d '=' | cut -c1)
+    if [ "${pretty_name_first_char}" = "\"" ]] ; then
+        bbwarn "Issue appears to be fixed by upstream, remove this workaround."
+    fi
+}
+
+addtask do_verify_if_fixed_by_upstream after do_compile before do_install
+addtask do_fix_quotes after do_verify_if_fixed_by_upstream before do_install
diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb
index a0a1b8a..4dbafd5 100644
--- a/recipes/ostree/ostree.bb
+++ b/recipes/ostree/ostree.bb
@@ -32,6 +32,7 @@ SRC_URI = " \
     file://0002-u-boot-Merge-ostree-s-and-systems-uEnv.txt.patch \
     file://0003-Allow-updating-files-in-root-of-boot.patch \
     file://0004-Mount-boot-partition.patch \
+    file://0005-Do-not-use-grub2-mkconfig.patch \
     "
 
 SRCREV = "efdb4d8f443768e59529c299290bee8b1f8f93c3"
diff --git a/recipes/ostree/ostree/0004-Mount-boot-partition.patch b/recipes/ostree/ostree/0004-Mount-boot-partition.patch
index 092e142..a81f731 100644
--- a/recipes/ostree/ostree/0004-Mount-boot-partition.patch
+++ b/recipes/ostree/ostree/0004-Mount-boot-partition.patch
@@ -1,82 +1,60 @@
-From 5e9ed74a20026e5c9043eaf8a224ce84cb9cd9f0 Mon Sep 17 00:00:00 2001
+From 33642082578946fdc73ade8b78c05ba8d8521652 Mon Sep 17 00:00:00 2001
 From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
-Date: Mon, 7 Dec 2015 18:14:26 +0100
-Subject: [PATCH] Mount boot partition
+Date: Mon, 7 Mar 2016 15:17:34 +0100
+Subject: [PATCH] ostree: Mount boot partition from user space
 
-On b2qt reference images the boot partition always is
-the first partition on a device and rootfs is the second
-partition. We can get the root parition from a kernel
-command line and deduce the right boot partition from there.
+In the current approach we assumed that boot/
+
+- is on a separate boot partition
+- boot partition is right before rootfs partition
+- rootfs parition is provided as a *device node*
+- has "ext2" filesystem (mount shell cmd tries to
+  auto detect FS type, mount system call does not.)
+
+The new approch does not assume any of the above, and
+moves this logic from early user space (initramfs) to
+user space. Initramfs by design should be used only to
+prepare the rootfs, other tasks should be done later.
 ---
- src/switchroot/ostree-prepare-root.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
+ src/switchroot/ostree-remount.c | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
 
-diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
-index 3de137b..2637dc3 100644
---- a/src/switchroot/ostree-prepare-root.c
-+++ b/src/switchroot/ostree-prepare-root.c
-@@ -45,7 +45,7 @@
- #include "ostree-mount-util.h"
- 
- static char *
--parse_ostree_cmdline (void)
-+parse_kernel_cmdline (const char *arg)
+diff --git a/src/switchroot/ostree-remount.c b/src/switchroot/ostree-remount.c
+index b8d3a96..33f2645 100644
+--- a/src/switchroot/ostree-remount.c
++++ b/src/switchroot/ostree-remount.c
+@@ -77,7 +77,7 @@ maybe_mount_tmpfs_on_var (void)
+ int
+ main(int argc, char *argv[])
  {
-   FILE *f = fopen("/proc/cmdline", "r");
-   char *cmdline = NULL;
-@@ -75,9 +75,9 @@ parse_ostree_cmdline (void)
-       const char *next_nonspc = next;
-       while (next_nonspc && *next_nonspc == ' ')
-        next_nonspc += 1;
--      if (strncmp (iter, "ostree=", strlen ("ostree=")) == 0)
-+      if (strncmp (iter, arg, strlen (arg)) == 0)
-         {
--         const char *start = iter + strlen ("ostree=");
-+   const char *start = iter + strlen (arg);
-          if (next)
-            ret = strndup (start, next - start);
-          else
-@@ -114,10 +114,12 @@ main(int argc, char *argv[])
-   const char *readonly_bind_mounts[] = { "/usr", NULL };
-   const char *root_mountpoint = NULL;
-   char *ostree_target = NULL;
-+  char *boot_partition = NULL;
-   char *deploy_path = NULL;
-   char srcpath[PATH_MAX];
-   char destpath[PATH_MAX];
-   char newroot[PATH_MAX];
-+  char boot_mountpoint[PATH_MAX];
+-  const char *remounts[] = { "/sysroot", "/etc", "/home", "/root", "/tmp", "/var", NULL };
++  const char *remounts[] = { "/sysroot", "/etc", "/home", "/root", "/tmp", "/var", "/boot", NULL };
    struct stat stbuf;
    int i;
  
-@@ -129,7 +131,7 @@ main(int argc, char *argv[])
+@@ -117,5 +117,22 @@ main(int argc, char *argv[])
  
-   root_mountpoint = argv[1];
+   maybe_mount_tmpfs_on_var ();
  
--  ostree_target = parse_ostree_cmdline ();
-+  ostree_target = parse_kernel_cmdline ("ostree=");
-   if (!ostree_target)
-     {
-       fprintf (stderr, "No OSTree target; expected ostree=/ostree/boot.N/...\n");
-@@ -246,6 +248,17 @@ main(int argc, char *argv[])
-       perrorv ("failed to MS_MOVE %s to %s", deploy_path, root_mountpoint);
-       exit (EXIT_FAILURE);
-     }
--  
-+
-+  /* first partition always is the boot partition */
-+  boot_partition = parse_kernel_cmdline ("root=");
-+  boot_partition[strlen (boot_partition) - 1] = '1';
-+  /* mount the real boot parition over the deployment's boot directory */
-+  snprintf (boot_mountpoint, sizeof(boot_mountpoint), "%s/boot/", root_mountpoint);
-+  if (mount (boot_partition, boot_mountpoint, "ext2", 0, NULL) < 0)
++  /* ostree-prepare-root mounts boot/ if it is on the same partition as root filesystem.
++   * If boot/ is not mounted, then it must be on a different partition. Try to mount
++   * filesystem where LABEL=boot-ostree.
++   */
++  if (!(lstat ("/boot/loader", &stbuf) == 0 && S_ISLNK (stbuf.st_mode)))
 +    {
-+       perrorv ("failed to mount boot parition %s to %s", boot_partition, boot_mountpoint);
-+       exit (EXIT_FAILURE);
++      /* mount the real boot parition over the deployment's boot directory */
++      const char *mount_cmd="mount LABEL=boot-ostree /boot";
++      FILE *fp = popen (mount_cmd, "w");
++      if (fp == NULL)
++        {
++          perrorv ("popen failed for: %s", mount_cmd);
++          exit (EXIT_FAILURE);
++        }
++      pclose (fp);
 +    }
 +
    exit (EXIT_SUCCESS);
  }
 -- 
-2.1.4
+2.7.0
 
diff --git a/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
new file mode 100644
index 0000000..1414ff7
--- /dev/null
+++ b/recipes/ostree/ostree/0005-Do-not-use-grub2-mkconfig.patch
@@ -0,0 +1,60 @@
+From b613d60319beffc861f5b1faa906d2ee0c685f52 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
+Date: Wed, 24 Feb 2016 18:12:27 +0100
+Subject: [PATCH] Do not use grub2-mkconfig.
+
+For details see: https://bugzilla.gnome.org/show_bug.cgi?id=762220
+---
+ src/libostree/ostree-bootloader-grub2.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-bootloader-grub2.c b/src/libostree/ostree-bootloader-grub2.c
+index 1f89914..7cfb0dc 100644
+--- a/src/libostree/ostree-bootloader-grub2.c
++++ b/src/libostree/ostree-bootloader-grub2.c
+@@ -282,6 +282,8 @@ grub2_child_setup (gpointer user_data)
+     }
+ }
+ 
++#define OSTREE_NO_GRUB2_MKCONFIG
++
+ static gboolean
+ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+                                        int                    bootversion,
+@@ -300,6 +302,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+   g_autoptr(GFile) config_path_efi_dir = NULL;
+   g_autofree char *grub2_mkconfig_chroot = NULL;
+ 
++#ifndef OSTREE_NO_GRUB2_MKCONFIG
+   if (ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
+       && g_file_has_parent (self->sysroot->path, NULL))
+     {
+@@ -322,7 +325,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+       tool_deployment_root = ostree_sysroot_get_deployment_directory (self->sysroot, tool_deployment);
+       grub2_mkconfig_chroot = g_file_get_path (tool_deployment_root);
+     }
+-
++#endif
+   if (self->is_efi)
+     {
+       config_path_efi_dir = g_file_get_parent (self->config_path_efi);
+@@ -337,9 +340,16 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader      *bootloader,
+                                                       bootversion);
+     }
+ 
++#ifdef OSTREE_NO_GRUB2_MKCONFIG
++  procctx = gs_subprocess_context_newv ("ostree-grub-generator", "-o",
++                                        gs_file_get_path_cached (new_config_path),
++                                        NULL);
++#else
+   procctx = gs_subprocess_context_newv ("grub2-mkconfig", "-o",
+                                         gs_file_get_path_cached (new_config_path),
+                                         NULL);
++#endif
++
+   child_env = g_environ_setenv (child_env, "_OSTREE_GRUB2_BOOTVERSION", bootversion_str, TRUE);
+   /* We have to pass our state to the child */
+   if (self->is_efi)
+-- 
+2.7.0
+