From 8556798b4ec9e703deb398c09d88e68c2af4cd54 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 11 Aug 2017 10:46:41 +0300
Subject: Remove all *.ci.local network addresses

The dot-local addresses cause problems with mDNS lookups, replace
all with *.intra.qt.io aliases that are now available.

Task-number: QTBUG-60153
Change-Id: I60e2e06440ca088d1194615849bf7792c16df362
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 scripts/upload.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

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 \
-- 
cgit v1.2.3-54-g00ecf


From 4c47c49fe0dee5c4ca48c6627d3b11df16bdffa7 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Fri, 9 Jun 2017 15:42:01 +0300
Subject: poky, meta layers: update morty branches to latest version

* poky morty branch 2.2.1 > 2.2.2, includes several
  security fixes
* meta-qt5 updated to Qt 5.9.2 (snapshot 1)
* meta-freescale, meta-freescale-3rdparty,
  meta-toradex-bsp-common & meta-toradex-nxp
  updated to latest morty branches

Change-Id: Iba5dca2293aa861cba40b3b6bdeeab319cfba28c
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 scripts/manifest.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 6ac1fbc..2581772 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -16,7 +16,7 @@
 
   <project name="poky"
            remote="yocto"
-           revision="8ab3fa375891eba3dc102b6ee7fee3582070654b"
+           revision="7d5822bf4cb2089687c3c9a908cf4a4ef4e9a53a"
            path="sources/poky"/>
   <project name="meta-openembedded"
            remote="oe-mirror"
@@ -24,7 +24,7 @@
            path="sources/meta-openembedded"/>
   <project name="meta-qt5"
            remote="qtyocto"
-           revision="5df9d273194e89498ea7fa93ac4ec987007253d2"
+           revision="41e4144d4d8c50b52ed6224a28f2ca4042c1e5b2"
            path="sources/meta-qt5"/>
   <project name="meta-mingw"
            remote="qtyocto"
@@ -33,12 +33,12 @@
 
   <project name="meta-freescale"
            remote="freescale"
-           revision="fc804d29ee85d58e9bb66f7319e749b53e192457"
+           revision="fa774ad7fb797957601a8c9fee45af453fea34b7"
            path="sources/meta-freescale"
            groups="notdefault,external,fsl,toradex,ti,smx6,renesas-gen3"/>
   <project name="meta-freescale-3rdparty"
            remote="freescale"
-           revision="a78b17c24e66567f272ad47f9d6300e6b1b90c29"
+           revision="1879485e63ce369292c89b5902ff6df13509090b"
            path="sources/meta-freescale-3rdparty"
            groups="notdefault,external,fsl,toradex,smx6"/>
   <project name="meta-ti"
@@ -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"/>
 
-- 
cgit v1.2.3-54-g00ecf