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

1 files changed, 2 insertions, 2 deletions

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