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

10 files changed, 16 insertions, 16 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 \