Update Yocto SDKs to Warrior

This is needed to include various fixes to allow building the CMake port against the contained sysroots. Change-Id: I42fc055a0e1e2abe5567b9ac3e1bc5e20fcd9900 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
wydev900 · Mar 19, 2020 · 00b3c63 · 00b3c63
1 parent 4ad5f4a
commit 00b3c63
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
@@ -89,7 +89,7 @@ Configurations:
     Target arch: 'mips64'
     Compiler: 'GCC'
     Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
     Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'

diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
@@ -44,11 +44,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."
 
-versionARM="2.6.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-9e1a27d.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package"
-SHA1="7c76230ef1bb58bf907daa81117d81b48534802c"
+versionARM="2.7.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-60f80be.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/warrior/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/warrior/$package"
+SHA1="b4a090f85268bed076451584cd48e27e17a6ae48"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/yocto-armv7"
 sysrootARMv7="sysroots/armv7at2hf-neon-poky-linux-gnueabi"
@@ -62,11 +62,11 @@ rm -rf "$yoctoInstaller"
 
 echo "Installing Yocto toolchain for 64-bit b2qt ARM64..."
 
-versionARM64="2.6.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-9e1a27d.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package"
-SHA1="598c24b8bcf289bb67a14aea51567c0d00bf5187"
+versionARM64="2.7.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-60f80be.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/warrior/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/warrior/$package"
+SHA1="9ba48d4d80a09908dd75090f94662c8192f0b19f"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/yocto-arm64"
 sysrootARM64="sysroots/aarch64-poky-linux"
@@ -80,14 +80,14 @@ rm -rf "$yoctoInstaller"
 
 echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..."
 
-versionMIPS64="2.6.1"
-package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-9e1a27d.sh"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package"
-AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package"
-SHA1="8cea8504463ab96322e92f3c6e9e922f394ae3c7"
+versionMIPS64="2.7.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-60f80be.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/warrior/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/warrior/$package"
+SHA1="b3a922b7501123464454c9a49f32b23fe1fd25b4"
 yoctoInstaller="/tmp/yocto-toolchain-mips64.sh"
 yoctoLocationMIPS64="/opt/yocto-mips64"
-sysrootMIPS64="sysroots/mips64-poky-linux"
+sysrootMIPS64="sysroots/mips64r2-poky-linux"
 crosscompileMIPS64="sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-"
 
 DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller"