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

* origin/jethro:
  VKB: correctly override PACKAGECONFIG
  psplash: remove from image
  imx6: enable QT_QPA_EGLFS_FORCEVSYNC for all imx6 devices
  colibri-vf: use older 4.1 version of kernel to fix color issue
  colibri-imx7: add u-boot-nand.imx to image
  colibri-vf: add kernel image to rootfs
  dbus-session-init: fix broken init script
  Improve repo fetching
  qt5 recipes cleanup
  qt5: update submodules
  qt5: remove obsolete file 0001-Allow-a-tools-only-build.patch

Conflicts:
	meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtcanvas3d_git.bbappend
	recipes-qt/qt5/qtcharts_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtgraphicaleffects_git.bbappend
	recipes-qt/qt5/qtimageformats_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bbappend
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bbappend
	recipes-qt/qt5/qtserialport_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebchannel_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I089e7d3667ac4ed150cc5c2201c2505103f548ee

11 files changed, 17 insertions, 51 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 08abc2a..2c0ed1f 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -162,7 +162,9 @@ mirror() {
   mkdir -p .repo/manifests
   cp ${DIR}/scripts/manifest.xml .repo/manifests/
   MANIFEST="manifest.xml"
-  ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g external --mirror
+  DEVICE=${DEVICE:-all}
+  get_groups
+  ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" --mirror
   ${REPO} sync
 }
 
@@ -183,7 +185,7 @@ init() {
     MANIFEST="manifest.xml"
   fi
   ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
-  ${REPO} sync
+  ${REPO} sync --optimized-fetch
 
   if [ ! -e "sources/meta-boot2qt" ]; then
     ln -s ${DIR} sources/meta-boot2qt
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 149894f..8565729 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -30,5 +30,8 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
+BOOT_SCRIPTS += " \
+    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    "
 
 DISTRO_FEATURES_remove = "webengine"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 1e8a5ac..d75bd9b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -45,6 +45,7 @@ DEFAULTTUNE = "armv7ahf-neon"
 
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+PREFERRED_VERSION_linux-toradex = "4.1"
 
 DISTRO_FEATURES_remove = "webengine"
 
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 77ce484..dfc24a1 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -27,6 +27,8 @@
 ##
 ############################################################################
 
+RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
+
 do_configure_prepend () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
index 7105f4b..1056ea0 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/mx6/appcontroller.conf
@@ -1,4 +1,5 @@
 env=FB_MULTI_BUFFER=2
+env=QT_QPA_EGLFS_FORCEVSYNC=1
 env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
 env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf
deleted file mode 100644
index 1056ea0..0000000
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/nitrogen6x/appcontroller.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-env=FB_MULTI_BUFFER=2
-env=QT_QPA_EGLFS_FORCEVSYNC=1
-env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins
-env=QT_IM_MODULE=qtvirtualkeyboard
-env=QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS=/dev/input/event0
-env=QT_GSTREAMER_CAMERABIN_VIDEOSRC=mxc_v4l2=imxv4l2videosrc,v4l2src
-env=QT_QUICK_CONTROLS_STYLE=Flat
-env=XDG_RUNTIME_DIR=/tmp
-base=linux
diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service
index dbd6fcd..8dcf081 100644
--- a/recipes/dbus/dbus/dbus-session.service
+++ b/recipes/dbus/dbus/dbus-session.service
@@ -4,8 +4,8 @@ After=dbus.service
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/dbus-session.init start
-ExecStop=/usr/bin/dbus-session.init stop
+ExecStart=/usr/bin/dbus-session.init.sh start
+ExecStop=/usr/bin/dbus-session.init.sh stop
 Environment=HOME=/home/root
 
 [Install]
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index f9f1345..dde2927 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -45,21 +45,21 @@ SYSTEMD_PACKAGES =+ "${PN}-session-init"
 FILES_${PN}-session-init = " \
     ${sysconfdir}/init.d/dbus-session \
     ${sysconfdir}/profile.d/dbus-session-address \
-    ${bindir}/dbus-session.init \
+    ${bindir}/dbus-session.init.sh \
     ${systemd_unitdir}/system/dbus-session.service \
     "
 
 do_install_append_class-target() {
-    sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init
+    sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
 
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/dbus-session.init ${D}${sysconfdir}/init.d/dbus-session
+        install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
     fi
 
     if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         install -m 0755 -d ${D}${bindir}/
-        install -m 0755 ${WORKDIR}/dbus-session.init ${D}${bindir}/
+        install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${bindir}/
 
         install -m 0755 -d ${D}${systemd_unitdir}/system
         install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 0e77368..55394d6 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -36,7 +36,6 @@ inherit packagegroup
 RDEPENDS_${PN} = "\
         kernel-modules \
         adbd \
-        psplash \
         openssh-sftp-server \
         openssl \
         openssl-misc \
diff --git a/recipes/psplash/files/qt.png b/recipes/psplash/files/qt.png
deleted file mode 100644
index 99c5d9d..0000000
--- a/recipes/psplash/files/qt.png
+++ /dev/null
diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend
deleted file mode 100644
index 0cbff06..0000000
--- a/recipes/psplash/psplash_git.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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}/files:"
-
-SPLASH_IMAGES = "file://qt.png;outsuffix=default"
-