Replace Ubuntu 20.04 with Ubuntu 22.04

Libclang version is built with Ubuntu 22.04 on it, others still keep old one which is built with Ubuntu 20.04. Task-number: QTQAINFRA-4926 Change-Id: I47bb49c1efecab6863ae52d3acf7eb47bdc47c35 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 64b24b0d85) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2026-02-01 11:26:04 +08:00 · 2022-10-04 14:11:14 +03:00
parent aa520141a0
commit cd22843cae
19 changed files with 58 additions and 146 deletions
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -8,15 +8,15 @@ Include: [
    ]
 Configurations:
 -
-    Id: 'ubuntu-20.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04-documentation'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'ubuntu-20.04'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -2,11 +2,11 @@ Version: 2
 Configurations:
 -
    Id: 'qemu-armv7-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
@@ -19,11 +19,11 @@ Configurations:
    ]
 -
    Id: 'qemu-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -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',
@@ -36,11 +36,11 @@ Configurations:
    ]
 -
    Id: 'qemu-mips64-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'mips64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -2,12 +2,12 @@ Version: 2
 Configurations:
 -
    Id: 'qnx-710-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QNX_710'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -17,12 +17,12 @@ Configurations:
    ]
 -
    Id: 'qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -30,12 +30,12 @@ Configurations:
    ]
 -
    Id: 'qnx-710-armv7-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QNX_710'
    Target arch: 'armv7'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'ubuntu-20.04-license-check'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04-license-check'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -34,6 +34,6 @@ Configurations:
        Features: ['Packaging', 'UseLegacyInstructions']
        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'GCC'
        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -2,13 +2,13 @@ Version: 2
 Configurations:
    -
      Id: "integrity-arm64"
-      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+      Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
      Compiler: 'GCC'
      Target os: 'INTEGRITY'
-      Platform dependency: 'ubuntu-20.04'
+      Platform dependency: 'ubuntu-22.04'
      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
      Environment variables: [
-          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
+          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
          'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
          'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
--- a/coin/platform_configs/meta-boot2qt.yaml
+++ b/coin/platform_configs/meta-boot2qt.yaml
@@ -2,42 +2,42 @@ Version: 2
 Module only: True
 Configurations:
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET1'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET2'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET3'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET4'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET5'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET6'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET7'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET8'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET9'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET10'
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Include: [
  cmake_platforms.yaml: [
-    "ubuntu-20.04",
+    "ubuntu-22.04",
    "windows-10_22h2-msvc2019-developer-build",
    "ios-universal"
  ],
--- a/coin/platform_configs/pyside-setup.yaml
+++ b/coin/platform_configs/pyside-setup.yaml
@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']

--- a/coin/platform_configs/qmake2cmake.yaml
+++ b/coin/platform_configs/qmake2cmake.yaml
@@ -14,6 +14,6 @@ Configurations:
    Compiler: 'GCC'
    Features: ['DisableTests']
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -34,6 +34,6 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -2,8 +2,8 @@ Version: 2
 Include: [ cmake_platforms_target_android.yaml ]
 Configurations:
 -
-    Id: 'automotive-ubuntu-20.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'automotive-ubuntu-22.04-documentation'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
--- a/coin/platform_configs/tqtc-pyside-setup.yaml
+++ b/coin/platform_configs/tqtc-pyside-setup.yaml
@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']

--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -53,6 +53,9 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

+PROVISIONING_DIR="$(dirname "$0")/../../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+
 libclang_version="15.0.0"

 if uname -a |grep -q Darwin; then
@@ -65,6 +68,11 @@ elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | g
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
    sha1="6ca035bb522022d34d61759e0460845832933b5c"
+elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
 else
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -163,6 +163,8 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
+#Java 11 for Android
+installPackages+=(openjdk-11-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/50-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/50-openssl_for_android_linux.sh
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install prebuilt OpenSSL which was built against Android NDK 21.
-# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
-
-set -ex
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-version="3.0.3"
-: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
-# Source built requires GCC and Perl to be in PATH.
-exports_file="/tmp/export.sh"
-# source previously made environmental variables.
-if uname -a |grep -q "Ubuntu"; then
-    # shellcheck disable=SC1090
-    grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
-    rm -rf "$exports_file"
-else
-    # shellcheck disable=SC1090
-    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
-    rm -rf "$exports_file"
-fi
-
-officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
-cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
-targetFile="/tmp/openssl-$version.tar.gz"
-sha="1138de3f1a2f573ae69302ab52ecd9bbf5e063ca"
-opensslHome="${HOME}/openssl/android/openssl-${version}"
-DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
-mkdir -p "${HOME}/openssl/android/"
-tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
-if uname -a |grep -q "Darwin"; then
-    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
-else
-    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
-fi
-cd "$opensslHome"
-PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
-PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
-'
-
-if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-darwin.tar.gz"
-    sha="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
-else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-r23b-linux.tar.gz"
-    sha="2d1b6f5d90b5e3ae6a7e2a376250c66e99371485"
-fi
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "${HOME}"
-
-opensslHome="${HOME}/openssl/android/openssl-${version}"
-SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
-
-echo "OpenSSL for Android = $version" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -51,8 +51,6 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 version="39fad60085501729985888d3f546c7b8d897a394"
 sha1="c66e3984cd647c8e32977dee72fe9d06f1b2ea28"

-# Provision Ubuntu 20.04-built package for 22.04
-# TODO: Remove libicu66 from 02-apt.sh when updating the package
 url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"
 url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"

--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/40-android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/40-android_linux.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash

 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -41,5 +41,4 @@

 set -ex

-# shellcheck source=../common/linux/android_linux.sh
-source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
+"$(dirname "$0")"/../common/linux/cleanup_cache.sh