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

1 files changed, 40 insertions, 0 deletions

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"
+