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, 1 insertions, 1 deletions

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