diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-07-25 13:53:41 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-07-26 11:51:43 +0300 |
| commit | eb019ef110b50f85df6a3274a1b7a0ca3af49e76 (patch) | |
| tree | f33ff287d9f3d4de58f141be1c6a0d30fe6ed3d7 /coin | |
| parent | 24435a5ca75d72ada9e82ef851efa69255be08bc (diff) | |
coin: update CI build instructions
Remove unneeded instructions, change the target machines
to jetson-tx2, apalis-imx6 and intel-corei7-64 and target
builds to use the QBSP.
Change-Id: I1f4e806b50aabdc7090634a9e0d6788ac8b8e21c
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 4f4bbd49..b6ea7a2b 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -13,37 +13,22 @@ environment: &environment type: Group instructions: - type: EnvironmentVariable - variableName: QT_QPA_PLATFORM - variableValue: offscreen - - type: Group - instructions: - - type: EnvironmentVariable - variableName: MACHINE - variableValue: jetson-tx1 - - type: EnvironmentVariable - variableName: QEMU_LD_PREFIX - variableValue: "{{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}" + variableName: MACHINE + variableValue: jetson-tx2 enable_if: condition: property property: target.arch equals_value: ARM64 - type: EnvironmentVariable variableName: MACHINE - variableValue: nitrogen6x - disable_if: - condition: property - property: target.arch - equals_value: ARM64 - - type: EnvironmentVariable - variableName: QEMU_LD_PREFIX - variableValue: "{{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}" + variableValue: apalis-imx6 enable_if: condition: property property: target.arch equals_value: ARMv7 - type: EnvironmentVariable - variableName: QEMU_LD_PREFIX - variableValue: "{{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}" + variableName: MACHINE + variableValue: intel-corei7-64 enable_if: condition: property property: target.arch @@ -69,8 +54,8 @@ build_instructions: source ./setup-environment.sh export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SSTATE_DIR DL_DIR" export SSTATE_DIR=/mnt/yocto-cache/sstate-caches/$(sed -n -e "s/DISTRO_CODENAME.*\"\(.*\)\"/\1/p" ../sources/poky/meta-*/conf/distro/poky.conf) - bitbake b2qt-embedded-qt5-image meta-toolchain-b2qt-embedded-qt5-sdk - SDKMACHINE=i686-mingw32 bitbake meta-toolchain-b2qt-embedded-qt5-sdk + bitbake meta-b2qt-embedded-qbsp + SDKMACHINE=i686-mingw32 bitbake meta-b2qt-embedded-qbsp filename: "{{.BuildDir}}/start-build" fileMode: 420 - type: ExecuteCommand |