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

10 files changed, 86 insertions, 108 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() {
diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
new file mode 100644
index 0000000..0fb28e5
--- /dev/null
+++ b/classes/internal-build.bbclass
@@ -0,0 +1,46 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+python enable_internal_build () {
+    import socket
+    try:
+        socket.gethostbyname('yocto-cache.ci.local')
+    except:
+        return
+
+    e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH")
+    e.data.setVar('PREMIRRORS', "\
+        ftp://.*/.*   http://yocto-cache.ci.local/sources/ \n \
+        http://.*/.*  http://yocto-cache.ci.local/sources/ \n \
+        https://.*/.* http://yocto-cache.ci.local/sources/ \n \
+        bzr://.*/.*   http://yocto-cache.ci.local/sources/ \n \
+        cvs://.*/.*   http://yocto-cache.ci.local/sources/ \n \
+        git://.*/.*   http://yocto-cache.ci.local/sources/ \n \
+        gitsm://.*/.* http://yocto-cache.ci.local/sources/ \n \
+        hg://.*/.*    http://yocto-cache.ci.local/sources/ \n \
+        osc://.*/.*   http://yocto-cache.ci.local/sources/ \n \
+        p4://.*/.*    http://yocto-cache.ci.local/sources/ \n \
+        svn://.*/.*   http://yocto-cache.ci.local/sources/ \n \
+        ")
+}
+
+addhandler enable_internal_build
+enable_internal_build[eventmask] = "bb.event.ConfigParsed"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 02e7811..5dd5c3d 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -252,20 +252,6 @@ BB_DISKMON_DIRS = "\
 #SSTATE_MIRRORS ?= "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
-SSTATE_MIRRORS ?= "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH"
-
-PREMIRRORS = "\
-ftp://.*/.*   http://yocto-cache.ci.local/sources/ \n \
-http://.*/.*  http://yocto-cache.ci.local/sources/ \n \
-https://.*/.* http://yocto-cache.ci.local/sources/ \n \
-bzr://.*/.*   http://yocto-cache.ci.local/sources/ \n \
-cvs://.*/.*   http://yocto-cache.ci.local/sources/ \n \
-git://.*/.*   http://yocto-cache.ci.local/sources/ \n \
-gitsm://.*/.* http://yocto-cache.ci.local/sources/ \n \
-hg://.*/.*    http://yocto-cache.ci.local/sources/ \n \
-osc://.*/.*   http://yocto-cache.ci.local/sources/ \n \
-p4://.*/.*    http://yocto-cache.ci.local/sources/ \n \
-svn://.*/.*   http://yocto-cache.ci.local/sources/ \n"
 
 #
 # Qemu configuration
@@ -285,6 +271,7 @@ CONF_VERSION = "1"
 
 INHERIT += "rm_work"
 INHERIT += "image-buildinfo"
+INHERIT += "internal-build"
 
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
index b09af7c..42013e7 100644
--- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb
+++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb
@@ -29,7 +29,7 @@ SRC_URI = " \
     git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \
     "
 
-SRCREV = "494283b7bf77f2801021e185c95ef948632ddddf"
+SRCREV = "ea222ff87942781d1091fdcd0385a0c842d21e15"
 BRANCH = "5.6"
 
 S = "${WORKDIR}/git"
diff --git a/recipes/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch b/recipes/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
deleted file mode 100644
index c0ea62f..0000000
--- a/recipes/gcc/gcc-4.9/0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b30ffb8097749fdb55704aa7d8307ca1a58255d6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= <s.mueller-klieser@phytec.de>
-Date: Tue, 7 Apr 2015 16:15:11 +0200
-Subject: [PATCH] gcc/var-tracking.c: backport from gcc trunk r212178
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-resolves a bug seen on cortexa8 building qt5 libraries.
-
-2014-06-30  Joseph Myers  <joseph@codesourcery.com>
-
-    * var-tracking.c (add_stores): Return instead of asserting if old
-    and new values for conditional store are the same.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212178 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
----
- gcc/var-tracking.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
-index 65d8285..7c38910 100644
---- a/gcc/var-tracking.c
-+++ b/gcc/var-tracking.c
-@@ -5997,7 +5997,8 @@ add_stores (rtx loc, const_rtx expr, void *cuip)
-     {
-       cselib_val *oval = cselib_lookup (oloc, GET_MODE (oloc), 0, VOIDmode);
- 
--      gcc_assert (oval != v);
-+      if (oval == v)
-+        return;
-       gcc_assert (REG_P (oloc) || MEM_P (oloc));
- 
-       if (oval && !cselib_preserved_value_p (oval))
--- 
-1.9.1
-
diff --git a/recipes/gcc/gcc-source_4.9.bbappend b/recipes/gcc/gcc-source_4.9.bbappend
deleted file mode 100644
index 2b937e6..0000000
--- a/recipes/gcc/gcc-source_4.9.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-##############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:COMM$
-##
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## $QT_END_LICENSE$
-##
-##############################################################################
-
-FILESEXTRAPATHS_append := "${THISDIR}/gcc-4.9:"
-
-SRC_URI += " \
-    file://0062-gcc-var-tracking.c-backport-from-gcc-trunk-r212178.patch \
-    "
diff --git a/recipes/meta/meta-environment.bbappend b/recipes/meta/meta-environment.bbappend
index 39f3586..276868d 100644
--- a/recipes/meta/meta-environment.bbappend
+++ b/recipes/meta/meta-environment.bbappend
@@ -19,6 +19,8 @@
 ##
 ##############################################################################
 
+inherit image-buildinfo
+
 toolchain_create_sdk_version_append () {
     echo 'Layer Revisions:' >> $versionfile
     echo '${@get_layer_revs(d)}' >> $versionfile
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 74cee35..28ccfa3 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -27,7 +27,6 @@
            remote="qtyocto"
            revision="e6897ccd0eec8fb5229e0fdd8f354292e0f49a16"
            path="sources/meta-qt5"/>
-
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
@@ -37,58 +36,58 @@
            remote="yocto"
            revision="8d22b44716fa624ff87383c36d222d9e28d0b267"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech,ti,bbb,smx6"/>
+           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
            revision="0da13d5a37a9d40ad6e41fe5eeeb532fef795a7a"
            path="sources/meta-ti"
-           groups="notdefault,ti,bbb"/>
+           groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
            revision="e82417d33b8147f65141ef937d56735d80ee7207"
            path="sources/meta-raspberrypi"
-           groups="notdefault,rpi"/>
+           groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
            revision="8fdde39f732be9e1ee9505a04c579073114459e7"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,fsl,toradex,architech,smx6"/>
+           groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
            remote="beagleboard"
            revision="b5c709b2b6bd3bf236df923fa8f245a00fbb1b60"
            path="sources/meta-beagleboard"
-           groups="notdefault,bbb"/>
+           groups="notdefault,external,bbb"/>
   <project name="meta-toradex"
            remote="toradex"
            revision="eca5937408c75a997b160bd1b92e1496b07421cf"
            path="sources/meta-toradex"
-           groups="notdefault,toradex"/>
+           groups="notdefault,external,toradex"/>
   <project name="meta-tibidabo"
            remote="architech"
            revision="06c6b09e0776507e1230aa98b5ca10d9d3968286"
            path="sources/meta-tibidabo"
-           groups="notdefault,architech"/>
+           groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
            revision="4e87c59bdedaa8c3e44fc02fd23be726c4d1dfb9"
            path="sources/meta-intel"
-           groups="notdefault,intel"/>
+           groups="notdefault,external,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
            revision="3125d29a5c58a471b67104d1bff965df38eb3115"
            path="sources/meta-tegra"
-           groups="notdefault,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
            path="sources/jetson-tk1-pro"
-           groups="notdefault,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
            path="sources/meta-smx6"
-           groups="notdefault,smx6"/>
+           groups="notdefault,internal"/>
 
 </manifest>
 
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index c9b86b2..29b401c 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -27,7 +27,6 @@
            remote="qtyocto"
            revision="5.7"
            path="sources/meta-qt5"/>
-
   <project name="meta-mingw"
            remote="qtyocto"
            path="sources/meta-mingw"
@@ -37,57 +36,58 @@
            remote="yocto"
            revision="jethro"
            path="sources/meta-fsl-arm"
-           groups="notdefault,fsl,toradex,architech,ti,bbb"/>
+           groups="notdefault,external,fsl,toradex,architech,ti,bbb,smx6"/>
   <project name="meta-ti"
            remote="yocto"
            revision="master"
            path="sources/meta-ti"
-           groups="notdefault,ti,bbb"/>
+           groups="notdefault,external,ti,bbb"/>
   <project name="meta-raspberrypi"
            remote="yocto"
            revision="master"
            path="sources/meta-raspberrypi"
-           groups="notdefault,rpi"/>
+           groups="notdefault,external,rpi"/>
   <project name="meta-fsl-arm-extra"
            remote="freescale"
            revision="jethro"
            path="sources/meta-fsl-arm-extra"
-           groups="notdefault,fsl,toradex,architech"/>
+           groups="notdefault,external,fsl,toradex,architech,smx6"/>
   <project name="meta-beagleboard"
            remote="beagleboard"
            revision="master"
            path="sources/meta-beagleboard"
-           groups="notdefault,bbb"/>
+           groups="notdefault,external,bbb"/>
   <project name="meta-toradex"
            remote="toradex"
            revision="V2.5"
            path="sources/meta-toradex"
-           groups="notdefault,toradex"/>
+           groups="notdefault,external,toradex"/>
   <project name="meta-tibidabo"
            remote="architech"
            revision="dora"
            path="sources/meta-tibidabo"
-           groups="notdefault,architech"/>
+           groups="notdefault,external,architech"/>
   <project name="meta-intel"
            remote="intel"
            revision="jethro"
            path="sources/meta-intel"
-           groups="notdefault,intel"/>
+           groups="notdefault,external,intel"/>
 
   <project name="meta-tegra"
            remote="playground"
            revision="master"
            path="sources/meta-tegra"
-           groups="notdefault,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="master"
            path="sources/jetson-tk1-pro"
-           groups="notdefault,nvidia-logan"/>
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="fido"
            path="sources/meta-smx6"
-           groups="notdefault,smx6"/>
+           groups="notdefault,internal"/>
+
 </manifest>
 
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 9e8c4d1..322792f 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -34,7 +34,7 @@ while test -n "$1"; do
 done
 
 THIS_SCRIPT="setup-environment.sh"
-if [ "$(basename $0)" = "${THIS_SCRIPT}" ]; then
+if [ "$(basename -- $0)" = "${THIS_SCRIPT}" ]; then
     echo "Error: This script needs to be sourced. Please run as '. $0'"
     exit 1
 fi