From 7fe6905893c5940d9c2ebebff50035656459bc2d Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Tue, 7 May 2024 10:24:48 +0000 Subject: [PATCH] Fix qtsaferenderer-runtime.yaml configuration Added new QEMU configurations Fixed compile error in Axivion build (prevents dev update) Change-Id: Iec75f86b241584c4b48904a13fa8e0aad032973a Reviewed-by: Tarja Sundqvist --- coin/platform_configs/qtsaferenderer-runtime.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index c413e5cb..a95c0295 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -26,6 +26,11 @@ Include: [ ], integrity.yaml: [ "integrity-arm64" + ], + cmake_platforms_qemu.yaml: [ + "qemu-arm64-developer-build", + "qemu-armv7-developer-build", + "qemu-mips64-developer-build" ] ] Configurations: @@ -37,11 +42,9 @@ Configurations: Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR'] - Configure arguments: '-nomake examples -release -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DINPUT_headersclean=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',