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

* origin/jethro:
  Rename last references to b2qt-utils
  Rename b2qt-utils to qtdeviceutilities
  toradex: apply u-boot and flashing script changes to colibri-imx7
  nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
  qt5: update submodules
  toradex: use latest u-boot and flashing scripts
  kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
  Use code.qt.io with git protocol instead of codereview
  Use new repo url for utils and appcontroller
  kontron: patch kernel to support newer vivante drivers
  Fetch only external repos for repo mirror
  qt5: update submodules
  Add rsync to image
  Fix raspberry3 build error in perl deployment
  rcar-gen2: USB fixups
  ostree: Added dependency for systemd
  qtquickcompiler: update revision
  qtquickcompiler: update revision
  Fix typo in RPi overlay config
  Update meta layers

Conflicts:
	conf/distro/include/toradex.inc
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
	meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
	recipes/ostree/ostree.bb
	recipes/samba/samba_4.1.12.bbappend
	scripts/manifest_jethro.xml

Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848

6 files changed, 19 insertions, 22 deletions

diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
index d270cc0..eafae4e 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb
@@ -31,18 +31,15 @@ DESCRIPTION = "Boot to Qt Appcontroller"
 LICENSE = "The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17"
 
-inherit qmake5 sdk-sources
+inherit qmake5
+require recipes-qt/qt5/qt5-git.inc
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-appcontroller/ \
+    git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \
     file://appcontroller.conf \
     "
 
 SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28"
-BRANCH = "5.7"
-PV = "5.7+git${SRCPV}"
-
-S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase"
 
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 25a567d..391224e 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     qtivi \
     neptune-ui \
     neptune-ui-apps \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
index 9c2008d..3d60eed 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb
@@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS_${PN} += " \
     b2qt-appcontroller \
-    b2qt-utils \
     b2qt-launcher \
     b2qt-demos \
     ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
index cd1f2d8..ed7c8dc 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb
@@ -44,11 +44,14 @@ RDEPENDS_${PN} += " \
     qt3d-dev \
     qtbase-dev \
     qtbase-staticdev \
-    qtcanvas3d \
+    qtcanvas3d-dev \
+    qtcharts-dev \
     qtconnectivity-dev \
+    qtdatavis3d-dev \
     qtdeclarative-dev \
     qtdeclarative-render2d-dev \
     qtdeclarative-staticdev \
+    qtdeviceutilities-dev \
     qtgraphicaleffects-dev \
     qtimageformats-dev \
     qtlocation-dev \
@@ -61,14 +64,10 @@ RDEPENDS_${PN} += " \
     qtsvg-dev \
     qttools-dev \
     qttools-staticdev \
+    qtvirtualkeyboard-dev \
     ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \
     ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \
     qtwebsockets-dev \
     qtwebchannel-dev \
     qtxmlpatterns-dev \
-    \
-    b2qt-utils-dev \
-    qtcharts-dev \
-    qtdatavis3d-dev \
-    qtvirtualkeyboard-dev \
     "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
index 06de528..7d7160d 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb
@@ -44,6 +44,7 @@ RDEPENDS_${PN} += " \
     qtdeclarative \
     qtdeclarative-render2d \
     qtdeclarative-tools \
+    qtdeviceutilities \
     qtgraphicaleffects \
     qtimageformats \
     qtlocation \
diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/qt5/qtdeviceutilities.bb
index 7579777..a4c0418 100644
--- a/recipes-qt/b2qt-addons/b2qt-utils.bb
+++ b/recipes-qt/qt5/qtdeviceutilities.bb
@@ -27,20 +27,22 @@
 ##
 ############################################################################
 
-DESCRIPTION = "Boot to Qt Utils module"
+DESCRIPTION = "Qt Device Utilities"
 LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
-inherit qt5-module sdk-sources
+inherit qt5-module
+require recipes-qt/qt5/qt5-git.inc
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant"
+
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
 SRC_URI = " \
-    git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Boot2Qt/sources/b2qt-utils \
+    git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \
     "
 
 SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c"
-BRANCH = "5.7"
-PV = "5.7+git${SRCPV}"
-
-S = "${WORKDIR}/git"
 
-DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity"
+DEPENDS = "qtbase qtdeclarative qtconnectivity"