From 582ab675784f07f84e22f5d15ea516261d2a05f9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 14 Dec 2015 15:32:20 +0200 Subject: Rename toolchain output file Rename the toolchain output to use both SDKMACHINE and MACHINE in the name, so that we don't need to rename it when uploading. This also adds -mingw32 into the windows SDK name. Change-Id: Id70c8bc456a15d263579eefdaa2a0e136741d0ba Reviewed-by: Teemu Holappa --- conf/distro/b2qt.conf | 4 ++++ scripts/upload.sh | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 33a335a..8dddfe6 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -26,6 +26,10 @@ DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" SDK_VERSION := "${DISTRO_VERSION}" +SDK_MACHINE = "${@d.getVar('SDKMACHINE', True) or '${SDK_ARCH}'}" +SDK_NAME = "${DISTRO}-${SDK_MACHINE}-${IMAGE_BASENAME}" +TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-${MACHINE}" + MAINTAINER = "B2Qt " SANITY_TESTED_DISTROS += " \ diff --git a/scripts/upload.sh b/scripts/upload.sh index a53bae6..e9dce02 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -50,4 +50,6 @@ if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then rsync b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ${UPLOADPATH}/ fi -rsync tmp/deploy/sdk/b2qt-glibc-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-*.sh ${UPLOADPATH}/b2qt-x86_64-${PROJECT}-toolchain-${MACHINE}.sh +if [ -e tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh ]; then + rsync tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh ${UPLOADPATH}/ +fi -- cgit v1.2.3-54-g00ecf