lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Remove system openssl3 on rhel 8

Browse Source 
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 <ville-pekka.karhu@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit 606a8b29c8)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This commit is contained in:
Matti Paaso
2025-12-18 12:33:16 +02:00
parent 7547bafd1e
commit 1fce08961a
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coin/provisioning/common/unix/install-openssl.sh
View File

@@ -34,6 +34,7 @@ if [[ "$os" == "linux" ]]; then
make && make install_sw install_ssldirs make && make install_sw install_ssldirs
SetEnvVar "OPENSSL_HOME" "$opensslHome" SetEnvVar "OPENSSL_HOME" "$opensslHome"
SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\"" SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
SetEnvVar "PKG_CONFIG_PATH" "\"$opensslHome/lib64/pkgconfig:\$PKG_CONFIG_PATH\""
if uname -a |grep -q "Debian"; then if uname -a |grep -q "Debian"; then
SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\"" SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\""
else else

5
coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh
View File

@@ -17,8 +17,6 @@ installPackages+=(ca-certificates)
installPackages+=(git) installPackages+=(git)
installPackages+=(zlib-devel) installPackages+=(zlib-devel)
installPackages+=(glib2-devel) installPackages+=(glib2-devel)
installPackages+=(openssl3)
installPackages+=(openssl3-devel)
installPackages+=(freetype-devel) installPackages+=(freetype-devel)
installPackages+=(fontconfig-devel) installPackages+=(fontconfig-devel)
installPackages+=(curl-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)" glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "glibc = $glibcVersion" >> versions.txt echo "glibc = $glibcVersion" >> versions.txt
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
# List all available updates # List all available updates
sudo yum -y list updates sudo yum -y list updates

5
coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh
View File

@@ -17,8 +17,6 @@ installPackages+=(ca-certificates)
installPackages+=(git) installPackages+=(git)
installPackages+=(zlib-devel) installPackages+=(zlib-devel)
installPackages+=(glib2-devel) installPackages+=(glib2-devel)
installPackages+=(openssl3)
installPackages+=(openssl3-devel)
installPackages+=(freetype-devel) installPackages+=(freetype-devel)
installPackages+=(fontconfig-devel) installPackages+=(fontconfig-devel)
installPackages+=(curl-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)" glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
echo "glibc = $glibcVersion" >> versions.txt echo "glibc = $glibcVersion" >> versions.txt
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
# List all available updates # List all available updates
sudo yum -y list updates sudo yum -y list updates