From 1fce08961a87ecc19ac01ac08e19a0b53065ac6b Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 18 Dec 2025 12:33:16 +0200 Subject: [PATCH] Provisioning: Remove system openssl3 on rhel 8 openssl3 package installation started to fail in provisioning due to missing dependencies. Removing installation, and rely on self compiled version of openssl3 (09-openssl.sh). Set PKG_CONFIG_PATH to the built openssl. Task-number: QTQAINFRA-7620 Change-Id: I4626fffe2de669686fd76b054018fb4f98983e36 Reviewed-by: Ville-Pekka Karhu Reviewed-by: Tero Heikkinen (cherry picked from commit 606a8b29c8aa126292421ee12565aac68dbf6088) Reviewed-by: Jukka Jokiniva --- coin/provisioning/common/unix/install-openssl.sh | 1 + .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 5 ----- .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/coin/provisioning/common/unix/install-openssl.sh b/coin/provisioning/common/unix/install-openssl.sh index 3b3353fb..02d298e6 100755 --- a/coin/provisioning/common/unix/install-openssl.sh +++ b/coin/provisioning/common/unix/install-openssl.sh @@ -34,6 +34,7 @@ if [[ "$os" == "linux" ]]; then make && make install_sw install_ssldirs SetEnvVar "OPENSSL_HOME" "$opensslHome" SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\"" + SetEnvVar "PKG_CONFIG_PATH" "\"$opensslHome/lib64/pkgconfig:\$PKG_CONFIG_PATH\"" if uname -a |grep -q "Debian"; then SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\"" else diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 6ff2a714..ba7086f3 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -17,8 +17,6 @@ installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) -installPackages+=(openssl3) -installPackages+=(openssl3-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) installPackages+=(curl-devel) @@ -184,8 +182,5 @@ echo "GCC = $gccVersion" >> versions.txt glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "glibc = $glibcVersion" >> versions.txt -OpenSSLVersion="$(openssl3 version |cut -b 9-14)" -echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt - # List all available updates sudo yum -y list updates diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 0c24ffd7..52b161c4 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -17,8 +17,6 @@ installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) -installPackages+=(openssl3) -installPackages+=(openssl3-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) installPackages+=(curl-devel) @@ -184,8 +182,5 @@ echo "GCC = $gccVersion" >> versions.txt glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "glibc = $glibcVersion" >> versions.txt -OpenSSLVersion="$(openssl3 version |cut -b 9-14)" -echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt - # List all available updates sudo yum -y list updates