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>

1 files changed, 8 insertions, 1 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