diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-26 15:53:06 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-10-30 08:12:10 +0000 |
commit | da8985fae240e7cf189a1376a6c7593656a024da (patch) | |
tree | 18ec849a047dba09ddf3141fd84156c3e6c8fa49 | |
parent | 88c0a44cc421f5cb614dd068c94984fd6cce6520 (diff) | |
download | meta-boot2qt-da8985fae240e7cf189a1376a6c7593656a024da.tar.gz |
QBSP: add Qt version to the QBSP file name
Change-Id: I343ac6b008044d31ea97c436d34eaed5d6f94819
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r-- | meta-boot2qt/classes/qbsp.bbclass | 4 | ||||
-rwxr-xr-x | 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() { | |||
156 | repogen -p ${B}/pkg ${B}/repository | 156 | repogen -p ${B}/pkg ${B}/repository |
157 | 157 | ||
158 | mkdir -p ${DEPLOY_DIR}/qbsp | 158 | mkdir -p ${DEPLOY_DIR}/qbsp |
159 | rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp | 159 | rm -f ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp |
160 | 160 | ||
161 | cd ${B}/repository | 161 | cd ${B}/repository |
162 | 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}.qbsp * | 162 | 7zr a ${DEPLOY_DIR}/qbsp/${PN}-${SDK_MACHINE}-${MACHINE}-${PV}.qbsp * |
163 | } | 163 | } |
164 | 164 | ||
165 | python do_qbsp() { | 165 | 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="\ | |||
38 | tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \ | 38 | tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \ |
39 | tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ | 39 | tmp/deploy/sdk/b2qt-i686-mingw32-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.7z \ |
40 | tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \ | 40 | tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-${MACHINE}.sh \ |
41 | tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-x86_64-${MACHINE}.qbsp \ | 41 | tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-x86_64-${MACHINE}-${RELEASE}.qbsp \ |
42 | tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-i686-mingw32-${MACHINE}.qbsp \ | 42 | tmp/deploy/qbsp/meta-b2qt-${PROJECT}-qbsp-i686-mingw32-${MACHINE}-${RELEASE}.qbsp \ |
43 | " | 43 | " |
44 | 44 | ||
45 | for f in ${UPLOADS}; do | 45 | for f in ${UPLOADS}; do |