qbsp: update installer-framework

Use latest release from publicly available server.
Search files for QBSP_IMAGE_CONTENT from alternative locations.

Task-number: QTBUG-64522
Change-Id: I64fd9f28640db996d908dc74b48cf0f462d74b52
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

2 files changed, 14 insertions, 5 deletions

diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass
index b8da767..71d1d45 100644
--- a/classes/qbsp-image.bbclass
+++ b/classes/qbsp-image.bbclass
@@ -42,7 +42,14 @@ fakeroot do_qbsp_image () {
         src=`echo $item | awk -F':' '{ print $1 }'`
         dst=`echo $item | awk -F':' '{ print $2 }'`
 
-        install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst
+        if [ -e "${IMGDEPLOYDIR}/$src" ]; then
+            install -D -m 0755 ${IMGDEPLOYDIR}/$src ${S}/qbsp/$dst
+        elif [ -e "${DEPLOY_DIR_IMAGE}/$src" ]; then
+            install -D -m 0755 ${DEPLOY_DIR_IMAGE}/$src ${S}/qbsp/$dst
+        else
+            echo "Could not copy file $src"
+            exit 1
+        fi
     done
 
     cd ${S}/qbsp
diff --git a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb
index 0ea0ec4..5bc09c0 100644
--- a/recipes-qt/qt5-addons/installer-framework_2.0.3.bb
+++ b/recipes-qt/qt5-addons/installer-framework_3.0.1.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -33,10 +33,12 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit bin_package native
 
-SRC_URI = "http://ci-files02-hki.intra.qt.io/packages/jenkins/opensource/ifw/installer-framework/installer-framework-build-stripped-linux-x64.7z"
+do_unpack[depends] += "p7zip-native:do_populate_sysroot"
 
-SRC_URI[md5sum] = "08beb5450c3938fcfd1b380f6aaec75d"
-SRC_URI[sha256sum] = "91bfef896db58f28e4c2c6db437b958101a59e87aa880c38b6ddc40ebe6c38e6"
+SRC_URI = "http://download.qt.io/development_releases/installer-framework/${PV}/installer-framework-build-stripped-${PV}-linux-x64.7z"
+
+SRC_URI[md5sum] = "68b7c1f761ca0dba18f1d165d66005d6"
+SRC_URI[sha256sum] = "c2eb769351025e0c7df2882116390fffaf958368f873a2abab99e37caee0a498"
 
 S = "${WORKDIR}/ifw-pkg"