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

* origin/jethro:
  Always append to MACHINE_EXTRA_INSTALL
  qt5: update submodules
  Enable dbus by default for neptune ui
  qt5: update submodules
  Add connman patch to disable connman with boot over nfs
  Update dbus-session-init to work with systemd

Conflicts:
	conf/distro/include/am335x-evm.conf
	conf/distro/include/beaglebone.conf
	conf/distro/include/nvidia-logan.conf
	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/qtcharts_git.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative-render2d_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtimageformats_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcompiler_git.bb
	recipes-qt/qt5/qtquickcontrols2_git.bbappend
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend

Change-Id: Ia73290b54a213a9670baab11e14522956e7bfec0

16 files changed, 108 insertions, 23 deletions

diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index bde997c..7f42acf 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -43,12 +43,12 @@ PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         libgles-omap3-dev \
         "
 
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 845e2ff..1e8a5ac 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -48,10 +48,10 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
 
 DISTRO_FEATURES_remove = "webengine"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         opengldummy \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         opengldummy-dev \
         "
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index a8dcc84..cd3a80a 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -43,10 +43,10 @@ KERNEL_MODULE_AUTOLOAD += "snd-intel8x0 vboxguest vboxsf"
 
 DISTRO_FEATURES_remove = "webengine opengl"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         mount-vboxsf \
         "
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         qtglesstream-dummy-client-dev \
         "
 MACHINE_EXTRA_INSTALL_QT = "\
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf
index 66d2b4c..b21e5b1 100644
--- a/conf/distro/include/imx7dsabresd.conf
+++ b/conf/distro/include/imx7dsabresd.conf
@@ -50,9 +50,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
 
 DISTRO_FEATURES_remove = "webengine"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
+MACHINE_EXTRA_INSTALL_SDK += "\
         "
 
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index 395a631..d350c0e 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -40,13 +40,13 @@ INITRAMFS_IMAGE = "initramfs-basic"
 
 SYSVINIT_ENABLED_GETTYS = "1"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         wayland \
         mesa-megadriver \
         grub-efi-config \
         "
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         mesa-dev \
         "
 
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 07647f8..751c264 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -97,7 +97,7 @@ KERNEL_DEVICETREE += "\
 
 DISTRO_FEATURES_DEFAULT += "wayland"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         bcm4330-nvram-config \
         "
 
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index 802a673..fb56934 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/conf/distro/include/raspberrypi.inc
@@ -36,11 +36,11 @@ BOOTFS_CONTENT = "\
 
 BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
 
-MACHINE_EXTRA_INSTALL_SDK = " \
+MACHINE_EXTRA_INSTALL_SDK += " \
         userland-dev \
         "
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         userland \
         omxplayer \
         "
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 490bc0f..9a33319 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -106,7 +106,7 @@ RENESAS_WORKAROUNGS = " \
     libdrm-tests \
 "
 
-MACHINE_EXTRA_INSTALL = " \
+MACHINE_EXTRA_INSTALL += " \
     kernel-devicetree \
     libdrm-kms \
     libegl \
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 5695b1c..1089f83 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -36,7 +36,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 BOOTFS_CONTENT = " "
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
         kernel-devicetree \
         "
 
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index f317ca9..34d23a9 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -29,7 +29,7 @@ KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
 PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 
-MACHINE_EXTRA_INSTALL = "\
+MACHINE_EXTRA_INSTALL += "\
     tegra-firmware-fecs \
     tegra-firmware-gmicrocode \
     tegra-firmware-gpccs \
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
index 32e3243..e9f3793 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Neptune
-After=systemd-user-sessions.service
+After=dbus.service dbus-session.service systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml -c am-config.yaml --dbus none Main.qml
+ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml
 Restart=on-failure
 WorkingDirectory=/opt/neptune
 
diff --git a/recipes/connman/connman_%.bbappend b/recipes/connman/connman_%.bbappend
new file mode 100644
index 0000000..0b03755
--- /dev/null
+++ b/recipes/connman/connman_%.bbappend
@@ -0,0 +1,24 @@
+##############################################################################
+##
+## 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$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-disable-connman-when-booting-over-nfs.patch"
diff --git a/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
new file mode 100644
index 0000000..f893746
--- /dev/null
+++ b/recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch
@@ -0,0 +1,21 @@
+From df70770f33280a915abb413678088a078d82341a Mon Sep 17 00:00:00 2001
+From: Mikko Gronoff <mikko.gronoff@qt.io>
+Date: Tue, 20 Sep 2016 11:02:50 +0300
+Subject: [PATCH] Disable connman when booting over NFS
+
+---
+ src/connman.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/connman.service.in b/src/connman.service.in
+index 09dfec9..4132cf7 100644
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
+ After=dbus.service network-pre.target systemd-sysusers.service
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
++ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus
diff --git a/recipes/dbus/dbus/dbus-session.init b/recipes/dbus/dbus/dbus-session.init
index 11a6757..0690511 100644
--- a/recipes/dbus/dbus/dbus-session.init
+++ b/recipes/dbus/dbus/dbus-session.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          dbus
 # Required-Start:    $remote_fs $syslog
@@ -17,13 +17,16 @@
 # set -e
 
 # Source function library.
-. /etc/init.d/functions
+#. /etc/init.d/functions
 
 DAEMON=@bindir@/dbus-launch
 NAME=dbus-session
 ADDRESSFILE=/var/run/dbus/session_bus_address
 UUIDDIR=/var/lib/dbus
 DESC="session message bus"
+APPCONTROLLERPATH="/tmp/b2qt/appcontroller.conf.d"
+APPCONTROLLERADDRESSFILE="session_bus_address"
+
 
 test -x $DAEMON || exit 0
 
@@ -38,12 +41,18 @@ if [ -e $ADDRESSFILE ]; then
   . $ADDRESSFILE
 fi
 
+if [ ! -d $APPCONTROLLERPATH ]; then
+mkdir -p $APPCONTROLLERPATH
+fi
+
 test "$ENABLED" != "0" || exit 0
 
 start_it_up()
 {
   echo -n "Starting $DESC: "
   $DAEMON --auto-syntax > $ADDRESSFILE
+  ADDR=`cat $ADDRESSFILE|grep -i DBUS_SESSION_BUS_ADDRESS=`
+  echo "env=${ADDR%?}" |tr -d \' > ${APPCONTROLLERPATH}/${APPCONTROLLERADDRESSFILE}
   echo "$NAME."
 }
 
diff --git a/recipes/dbus/dbus/dbus-session.service b/recipes/dbus/dbus/dbus-session.service
new file mode 100644
index 0000000..dbd6fcd
--- /dev/null
+++ b/recipes/dbus/dbus/dbus-session.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=D-BUS Session Message Bus.
+After=dbus.service
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/dbus-session.init start
+ExecStop=/usr/bin/dbus-session.init stop
+Environment=HOME=/home/root
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/recipes/dbus/dbus_%.bbappend b/recipes/dbus/dbus_%.bbappend
index b7fff89..f9f1345 100644
--- a/recipes/dbus/dbus_%.bbappend
+++ b/recipes/dbus/dbus_%.bbappend
@@ -27,28 +27,46 @@
 ##
 ############################################################################
 
+inherit systemd
+
 FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
 SRC_URI += " \
     file://dbus-session.init \
+    file://dbus-session.service \
     file://dbus-session-address \
     "
-
 INITSCRIPT_PACKAGES = "${PN} ${PN}-session-init"
 INITSCRIPT_NAME_${PN}-session-init = "dbus-session"
 INITSCRIPT_PARAMS_${PN}-session-init = "start 20 5 3 2 . stop 10 0 1 6 ."
 
 PACKAGES =+ "${PN}-session-init"
+SYSTEMD_PACKAGES =+ "${PN}-session-init"
+
 FILES_${PN}-session-init = " \
     ${sysconfdir}/init.d/dbus-session \
     ${sysconfdir}/profile.d/dbus-session-address \
+    ${bindir}/dbus-session.init \
+    ${systemd_unitdir}/system/dbus-session.service \
     "
 
 do_install_append_class-target() {
+    sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init
+
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
-        sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-session.init >${WORKDIR}/dbus-session.init.sh
-        install -m 0755 ${WORKDIR}/dbus-session.init.sh ${D}${sysconfdir}/init.d/dbus-session
+        install -m 0755 ${WORKDIR}/dbus-session.init ${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 -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/dbus-session.service ${D}${systemd_unitdir}/system/
+    fi
+
     install -d ${D}${sysconfdir}/profile.d
     install -m 0755 ${WORKDIR}/dbus-session-address ${D}${sysconfdir}/profile.d/
 }
+
+SYSTEMD_SERVICE_${PN}-session-init = "dbus-session.service"