From 01256c68c24ef97547c1d2ef21c9b9791e3e8410 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 11 Oct 2024 13:39:11 +0300 Subject: [PATCH] Provisioning: Fix missing libtommath-dev for Firebird in RTA Needed for these (Linux x64): - Rhel 9.2 - SLES 15 SP5 - OpenSUSE 15.5 - Ubuntu 22.04 SLES 15 SP5 needs to activate PackageHub/15.5/x86_64 -module Firebird was enabled in here: 333cbd059225773fcf7d329c61e7df9d4be2bff7 Task-number: QTBUG-129845 Change-Id: Ia3a270502e6985a7edab5c9dc937491c7ac6038f Reviewed-by: Alexandru Croitor --- .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-SLES-15_SP5-x86_64/02-enable-modules.sh | 2 ++ .../qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 3 +++ .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 3 +++ 5 files changed, 13 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 299ed222..e55c0210 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -164,6 +164,8 @@ installPackages+=(zip) installPackages+=(perl-IPC-Cmd) # password management support for Qt Creator installPackages+=(libsecret-devel) +# For Firebird in RTA +installPackages+=(libtommath-devel) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-enable-modules.sh index 55c697e3..13494701 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-enable-modules.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-enable-modules.sh @@ -17,6 +17,8 @@ sudo SUSEConnect -p sle-module-development-tools/15.5/x86_64 sudo SUSEConnect -p sle-module-python3/15.5/x86_64 # sle-module-web-scripting is required for Nodejs sudo SUSEConnect -p sle-module-web-scripting/15.5/x86_64 +# For Firebird in RTA - libtommath-devel +sudo SUSEConnect -p PackageHub/15.5/x86_64 sudo zypper lr -u diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index 275592ea..f639e2fd 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -106,6 +106,9 @@ sudo zypper -nq install openssl-3 # cifs-utils, for mounting smb drive sudo zypper -nq install cifs-utils +# For Firebird in RTA +sudo zypper -nq install libtommath-devel + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt diff --git 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 index 7bfd5cd9..c7f6b6d0 100755 --- 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 @@ -240,6 +240,9 @@ installPackages+=(iptables-persistent) installPackages+=(patchelf) +# For Firebird in RTA +installPackages+=(libtommath-dev) + echo "Running update for apt" waitLoop sudo apt-get update diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index 0cad2372..6ac19511 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -78,6 +78,9 @@ sudo zypper -nq install valgrind-devel # cifs-utils, for mounting smb drive sudo zypper -nq install cifs-utils +# For Firebird in RTA +sudo zypper -nq install libtommath-devel + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt