From 14ca3bbb7581d432c0d18abede6cb6bc9450e442 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Mon, 27 Jan 2025 09:59:51 +0200 Subject: [PATCH] Revert arm side of VxWorks VSB/VIP update This caused tst_qplaintextedit to start flaking a lot. Partially reverts b25251e2baa1f347e7609ae917c7b172538a79a8. Task-number: QTBUG-133243 Change-Id: I348faa09831720a43aeb1f8097c42185e32c31dd Reviewed-by: Jukka Jokiniva --- coin/provisioning/common/linux/vx_works.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/vx_works.sh b/coin/provisioning/common/linux/vx_works.sh index 5f9ff012..19d8e5d0 100755 --- a/coin/provisioning/common/linux/vx_works.sh +++ b/coin/provisioning/common/linux/vx_works.sh @@ -21,12 +21,12 @@ InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" SetEnvVar "VXWORKS_HOME" "/opt/vxworks" SetEnvVar "VXWORKS_SSH" "WindRiver@172.31.1.10" -VXWORKS_BUILD_VER="18-12-2024" +VXWORKS_BUILD_VER="07-11-2024" ######### 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_${VXWORKS_BUILD_VER}.tar.gz" AltUrl="" -sha1="6b5a264d08a9d34b03ff13cb28e690c5c5178569" +sha1="f4745e9b84a781fe2c0a44abee189fcdf1c2c100" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB" @@ -35,10 +35,11 @@ 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_${VXWORKS_BUILD_VER}.tar.gz" AltUrl="" -sha1="117af91a6c93ac89727f8d8bfe4cf840ce4485c9" +sha1="186d7da071005d67d898a56cf57b7bec664bb89e" 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_${VXWORKS_BUILD_VER}.tar.gz" AltUrl=""