diff options
author | Toni Saario <[email protected]> | 2025-04-09 12:45:24 +0300 |
---|---|---|
committer | Toni Saario <[email protected]> | 2025-06-04 18:01:31 +0000 |
commit | 4c3fe223809e834cbf92f1733f2b2d2a6e34f5a0 (patch) | |
tree | ca0c1bf4a094df6e6d524f43e9e4f0ab0af89966 | |
parent | 066371f7cd2618246c7e4fb34d96c77a943a2a53 (diff) |
VxWorks version update to 25.03 from 24.03.
Removed xf86drm patch.
Pick-to: 6.10
Change-Id: Idd5930fae79c68bc6c14cba5245404de9e851ef8
Reviewed-by: Matti Paaso <[email protected]>
-rw-r--r-- | coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/vx_works.sh | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml index 91e7cfa32..090e6a81f 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml @@ -24,7 +24,7 @@ Configurations: Platform dependency: 'ubuntu-22.04' Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests'] Environment variables: [ - 'WIND_CC_SYSROOT=/opt/nxp_imx8_1_0_6_3_VSB', + 'WIND_CC_SYSROOT=/opt/nxp_imx8_1_0_7_0_VSB', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples', 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' ] diff --git a/coin/provisioning/common/linux/vx_works.sh b/coin/provisioning/common/linux/vx_works.sh index cb600ab5c..5e190d9cd 100755 --- a/coin/provisioning/common/linux/vx_works.sh +++ b/coin/provisioning/common/linux/vx_works.sh @@ -13,21 +13,21 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" ######### VXworks libs ######### # Installs to /opt/vxworks -PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_libs_2403.tar.gz" +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_libs_2503.tar.gz" AltUrl="" -sha1="8152c527ca489b1e51f2954e6e88c6daa22d88f6" +sha1="96db52d86c2138a1ca31212372f48838ec08013e" targetFolder="/opt" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" SetEnvVar "VXWORKS_HOME" "/opt/vxworks" SetEnvVar "VXWORKS_SSH" "[email protected]" # IMX 6 -VXWORKS_BUILD_VER="07-11-2024" +VXWORKS_BUILD_VER="16-04-2025" ######### VXworks toolchain ######### # Installs to /opt/fsl_imx6_2_0_6_2_VSB PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_$%7BVXWORKS_BUILD_VER%7D.tar.gz" AltUrl="" -sha1="f4745e9b84a781fe2c0a44abee189fcdf1c2c100" +sha1="88f0f139ac62e8c0a4c5477d880a1ff345826479" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB" @@ -36,30 +36,28 @@ SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB" # Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_$%7BVXWORKS_BUILD_VER%7D.tar.gz" AltUrl="" -sha1="186d7da071005d67d898a56cf57b7bec664bb89e" +sha1="96056c0f9b1234160db2d9038a9e6fc24a2bbbd7" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" # IMX 8 -VXWORKS_BUILD_VER="03-03-2025" # Installs to /opt/nxp_imx8_1_0_6_3_VSB PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_imx8_vsb_$%7BVXWORKS_BUILD_VER%7D.tar.gz" AltUrl="" -sha1="d7afe3f57748b87f6ea8932f079c18e67a58f30e" +sha1="cf6194b78bf08b894397fd5ce2a57abd25cf497b" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" -VXWORKS_BUILD_VER="18-12-2024" # Installs to /opt/itl_generic_skylake_VSB PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vsb_$%7BVXWORKS_BUILD_VER%7D.tar.gz" AltUrl="" -sha1="c1b2f2e2903540e8005237ce3641fc043ced0ddf" +sha1="4c75222364d3907db9fb1605cabe0c92616d9ec9" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" # Installs to /opt/itl_generic_skylake_VIP_QEMU PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vip_$%7BVXWORKS_BUILD_VER%7D.tar.gz" AltUrl="" -sha1="2fa12dac1f1460019a418da49b095c743a9fe282" +sha1="c3af7da92832ea71201dcf1022d7404966291f5c" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" |