Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:

  qtivi: don't use dlt by default
  poky, meta layers: update morty branches to latest version
  Remove all *.ci.local network addresses

Conflicts:
   scripts/manifest.xml

Change-Id: I7918561f735604be2fd7e532bd3dfb8aec1d068d

5 files changed, 18 insertions, 18 deletions

diff --git a/classes/internal-build.bbclass b/classes/internal-build.bbclass
index ecee863..0f12a78 100644
--- a/classes/internal-build.bbclass
+++ b/classes/internal-build.bbclass
@@ -30,24 +30,24 @@
 python enable_internal_build () {
     import socket
     try:
-        socket.gethostbyname('yocto-cache.ci.local')
+        socket.gethostbyname('yocto-cache.intra.qt.io')
     except:
         return
 
     e.data.setVar('ENABLE_QTQUICKCOMPILER', "1")
-    e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.ci.local/sstate-caches/${DISTRO_CODENAME}/PATH")
+    e.data.setVar('SSTATE_MIRRORS', "file://.* http://yocto-cache.intra.qt.io/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 \
+        ftp://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
+        http://.*/.*  http://yocto-cache.intra.qt.io/sources/ \n \
+        https://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \
+        bzr://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
+        cvs://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
+        git://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
+        gitsm://.*/.* http://yocto-cache.intra.qt.io/sources/ \n \
+        hg://.*/.*    http://yocto-cache.intra.qt.io/sources/ \n \
+        osc://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
+        p4://.*/.*    http://yocto-cache.intra.qt.io/sources/ \n \
+        svn://.*/.*   http://yocto-cache.intra.qt.io/sources/ \n \
         ")
 }
 
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 3dbf07e..6b364d3 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -54,7 +54,7 @@ SRCREV_qface = "b1d96d85a7c43ac74335b9a1a99a68507047f5bc"
 SRCREV = "${SRCREV_qtivi}"
 SRCREV_FORMAT = "qtivi_qface"
 
-PACKAGECONFIG ?= "taglib dlt ivigenerator"
+PACKAGECONFIG ?= "taglib ivigenerator"
 PACKAGECONFIG[taglib] = "QMAKE_EXTRA_ARGS+=-feature-taglib,QMAKE_EXTRA_ARGS+=-no-feature-taglib,taglib"
 PACKAGECONFIG[dlt] = "QMAKE_EXTRA_ARGS+=-feature-dlt,QMAKE_EXTRA_ARGS+=-no-feature-dlt,dlt-daemon"
 PACKAGECONFIG[geniviextras-only] = "QMAKE_EXTRA_ARGS+=--geniviextras-only"
diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
index 03cba46..0ea0ec4 100644
--- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
+++ b/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
@@ -33,7 +33,7 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit bin_package native
 
-SRC_URI = "http://ci-files02-hki.ci.local/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z"
+SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z"
 
 SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d"
 SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5c5e558..569c0c8 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -73,12 +73,12 @@
            groups="notdefault,external,renesas-gen3"/>
   <project name="meta-toradex-bsp-common"
            remote="toradex"
-           revision="554adccf11f2ba2947ed221307ddd703c0889967"
+           revision="b128af95613557af8deaea30212e89e6316eab88"
            path="sources/meta-toradex-bsp-common"
            groups="notdefault,external,toradex"/>
   <project name="meta-toradex-nxp"
            remote="toradex"
-           revision="d351e11b76c004afbf0f37d5481266bafdb015ee"
+           revision="89a17628efef01fd5af202e88d79188df08f636f"
            path="sources/meta-toradex-nxp"
            groups="notdefault,external,toradex"/>
 
diff --git a/scripts/upload.sh b/scripts/upload.sh
index cb94719..4f4e1a8 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -32,7 +32,7 @@ set -x
 set -e
 
 RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*)
-UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
+UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 UPLOADS="\
     tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \