diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-15 15:49:52 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-11-16 14:31:53 +0000 |
| commit | 0af8477aaa48831eff9669466413266e8a26f98e (patch) | |
| tree | a8a8b6dc8d853a5bf66fe2172440acbda7b12223 /classes | |
| parent | 6b82741249f9dff473dc9993ffaf9b13b5978ce2 (diff) | |
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>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qbsp-image.bbclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/classes/qbsp-image.bbclass b/classes/qbsp-image.bbclass index b8da7673..71d1d455 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 |