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

1 files changed, 4 insertions, 2 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