From caf1273921fad056115d0eb17a6feba4e69fbab7 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 21 Jul 2023 17:38:00 +0300 Subject: [PATCH] Coin: install specific version of openjdk 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android's sdkmanager seems to fail with openjdk 11 version 11.0.20.0.8. The previous version 11.0.19.0.7 seems to work. the error is failure to find /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat. This is more of a workaround for now to unblock provisioning. Change-Id: Ib50b497c6e8b6bffd0739bf665ab1deb5bd51666 Reviewed-by: Simo Fält (cherry picked from commit 8b6151e23da67ef700b2990920b0f9c2cdb5f0af) --- .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 2 +- .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index d317cdad..69e55a78 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -85,7 +85,7 @@ installPackages+=(nspr-devel) installPackages+=(nss-devel) installPackages+=(python3-html5lib) # For Android builds -installPackages+=(java-11-openjdk-devel) +installPackages+=(java-11-openjdk-devel-11.0.19.0.7) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 40b19325..7a93e6af 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -113,7 +113,7 @@ installPackages+=(python3-html5lib) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9) installPackages+=(libstdc++-static) # For Android builds -installPackages+=(java-11-openjdk-devel) +installPackages+=(java-11-openjdk-devel-11.0.19.0.7) # For receiving shasum installPackages+=(perl-Digest-SHA) # INTEGRITY requirements