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

* origin/fido:
  Move usage of internal mirrors into a bbclass
  Use --internal arg to fetch playground repos
  qtquickcompiler: update revision to work with Qt 5.6.1
  qt5: update submodules
  gcc: patch already applied on oe layer
  Update revisions for poky and openembedded
  Fix meta-environment to work without changes in local.conf
  Disabled SSTATE_MIRRORS and PRE_MIRRORS.
  setup-environment: prevent basename argument being parsed as option.
  Do not pull internal repos when initializing for all devices

Conflicts:
	conf/local.conf.sample
	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/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.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	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/qtwayland-native_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
	scripts/manifest_jethro.xml

Change-Id: I17c4dd6890dc4475171133cede4dc7e6217222d6

1 files changed, 12 insertions, 3 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 8541c72..b395e5d 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -26,7 +26,10 @@ usage() {
    echo "Usage: $(basename $0) COMMAND [ARGS]"
    echo
    echo "Initialize build environment:"
-   echo "  $(basename $0) init --device <name> [--reference <mirror path>]"
+   echo "  $(basename $0) init --device <name> [--reference <mirror path>] [--internal]"
+   echo "    --device <name>: target device name or 'all'"
+   echo "    --reference <mirror path>: path to local mirror, initialized previously with '$(basename $0) mirror'"
+   echo "    --internal: fetch internal repositories, available only inside The Qt Company network."
    echo "Initialize local mirror:"
    echo "  $(basename $0) mirror"
    echo "List available devices:"
@@ -51,6 +54,9 @@ while test -n "$1"; do
       shift
       REPO_URL="--repo-url $1"
       ;;
+    "--internal")
+      INTERNAL="y"
+      ;;
     *)
       if [ -n "$COMMAND" ]; then
         echo "Unknown argument: $1"
@@ -90,7 +96,7 @@ get_repo() {
 get_groups() {
   case ${DEVICE} in
     all)
-      PROJECT_GROUPS="all"
+      PROJECT_GROUPS="external"
     ;;
     apalis-imx6|colibri-imx6|colibri-vf)
       PROJECT_GROUPS="toradex"
@@ -127,11 +133,14 @@ get_groups() {
     ;;
     *)
       echo "Unknown device configuration, including all meta layers"
-      PROJECT_GROUPS="all"
+      PROJECT_GROUPS="external"
     ;;
   esac
 
   PROJECT_GROUPS="${PROJECT_GROUPS} default"
+  if [ "${INTERNAL}" = "y" ]; then
+    PROJECT_GROUPS="${PROJECT_GROUPS} internal"
+  fi
 }
 
 list_devices() {