From 8556798b4ec9e703deb398c09d88e68c2af4cd54 Mon Sep 17 00:00:00 2001 From: Samuli Piippo 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 --- classes/internal-build.bbclass | 26 +++++++++++----------- recipes-qt/qt5-addons/installer-framework_2.0.3.bb | 2 +- scripts/upload.sh | 2 +- 3 files changed, 15 insertions(+), 15 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/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/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 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 --- scripts/manifest.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 @@ -- cgit v1.2.3-54-g00ecf From c04cc5996405bf648b69e39aba285a5fad39b3d3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 15 Aug 2017 11:28:15 +0300 Subject: qtivi: don't use dlt by default Current set of meta layers do not provide recipe for dlt-daemon. Fix error Nothing PROVIDES 'dlt-daemon' Change-Id: If55fc24731a2673f471d140e038f9dc0966f02e9 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/qtivi_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3-54-g00ecf