diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-29 09:48:03 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-10-02 13:04:13 +0000 |
| commit | 2c947f7073bbf20e5a587b5d2b05f8b8298ef74d (patch) | |
| tree | 8d76bcde80cfc2008ff6fe072435007d67fdc4e1 | |
| parent | cb6f8788d3e1de2540751f25a923438d3f3bf868 (diff) | |
| download | meta-boot2qt-2c947f7073bbf20e5a587b5d2b05f8b8298ef74d.tar.gz | |
Add generic qemuarmv7 machine config
To be used in Qt CI builds
Task-number: QTQAINFRA-1457
Change-Id: I7ef21aa05c65f50539e2f70b21da375a9b3eea02
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| -rw-r--r-- | conf/machine/qemuarmv7.conf | 8 | ||||
| -rwxr-xr-x | scripts/upload.sh | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/conf/machine/qemuarmv7.conf b/conf/machine/qemuarmv7.conf new file mode 100644 index 0000000..530f802 --- /dev/null +++ b/conf/machine/qemuarmv7.conf | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #@TYPE: Machine | ||
| 2 | #@NAME: generic armv machine | ||
| 3 | #@DESCRIPTION: Machine configuration for running a generic armv7 | ||
| 4 | |||
| 5 | DEFAULTTUNE = "armv7athf-neon" | ||
| 6 | |||
| 7 | require conf/machine/include/qemu.inc | ||
| 8 | require conf/machine/include/arm/arch-armv7a.inc | ||
diff --git a/scripts/upload.sh b/scripts/upload.sh index 4f4e1a8..e77f96d 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh | |||
| @@ -37,6 +37,7 @@ UPLOADS="\ | |||
| 37 | tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 37 | tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
| 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 | " | 41 | " |
| 41 | 42 | ||
| 42 | for f in ${UPLOADS}; do | 43 | for f in ${UPLOADS}; do |
