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

3 files changed, 24 insertions, 25 deletions

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