Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:
  dracut: remove bbappend
  BBB: add systemd service for powervr drivers
  Jetson-TX1: Add ability to mount root via NFS
  NUC: disable hw cursor for intel nuc
  adbd: remove component
  Update update-qt5-modules script handle qtlocation

Change-Id: Ied32e11749d81af9ea74714f4d3607d2680bf327

4 files changed, 48 insertions, 0 deletions

diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend b/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend
new file mode 100644
index 0000000..708ed85
--- /dev/null
+++ b/meta-intel-extras/recipes/qt5/b2qt-appcontroller.bbappend
@@ -0,0 +1,38 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## 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 https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://kms.conf"
+
+FILES_${PN} += "${sysconfdir}/kms.conf"
+
+do_install_append() {
+    install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/
+}
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf
new file mode 100644
index 0000000..ca5f455
--- /dev/null
+++ b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/appcontroller.conf
@@ -0,0 +1,7 @@
+env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf
+env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
+env=QT_IM_MODULE=qtvirtualkeyboard
+env=QT_QPA_EGLFS_FORCE888=0
+env=QT_QUICK_CONTROLS_1_STYLE=Flat
+env=XDG_RUNTIME_DIR=/tmp
+base=linux
diff --git a/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf
new file mode 100644
index 0000000..d6da06c
--- /dev/null
+++ b/meta-intel-extras/recipes/qt5/b2qt-appcontroller/kms.conf
@@ -0,0 +1,3 @@
+{
+  "hwcursor": false
+}
diff --git a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend b/meta-intel-extras/recipes/qt5/qtbase_git.bbappend
index 602782e..602782e 100644
--- a/meta-intel-extras/recipes/recipes-qt/qtbase_git.bbappend
+++ b/meta-intel-extras/recipes/qt5/qtbase_git.bbappend