From da8985fae240e7cf189a1376a6c7593656a024da Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 26 Oct 2018 15:53:06 +0300 Subject: QBSP: add Qt version to the QBSP file name Change-Id: I343ac6b008044d31ea97c436d34eaed5d6f94819 Reviewed-by: Mikko Gronoff --- meta-boot2qt/classes/qbsp.bbclass | 4 ++-- scripts/upload.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-boot2qt/classes/qbsp.bbclass b/meta-boot2qt/classes/qbsp.bbclass index bdce9fb..7c6f7ef 100644 --- a/meta-boot2qt/classes/qbsp.bbclass +++ b/meta-boot2qt/classes/qbsp.bbclass @@ -156,10 +156,10 @@ create_qbsp() { repogen -p ${B}/pkg ${B}/repository mkdir -p ${DEPLOY_DIR}/qbsp - rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp + rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp cd ${B}/repository - 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp * + 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * } python do_qbsp() { diff --git a/scripts/upload.sh b/scripts/upload.sh index f0a0385..9d4448c 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -38,8 +38,8 @@ UPLOADS="\ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \ tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \ - tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-x86_64-${MACHINE}.qbsp \ - tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-i686-mingw32-${MACHINE}.qbsp \ + tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-x86_64-${MACHINE}-${RELEASE}.qbsp \ + tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-i686-mingw32-${MACHINE}-${RELEASE}.qbsp \ " for f in ${UPLOADS}; do -- cgit v1.2.3-54-g00ecf