diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-12-12 16:15:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-13 14:58:08 +0100 |
| commit | 68c8693e5b451106478c0bc54aa5125f6cc2b02d (patch) | |
| tree | 490d1358ec74478e4f951056f8a67f88aaf3f8fe /coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | |
| parent | 2d6f569ee9d66ff49ab803ad9c48a954e637e1da (diff) | |
| parent | 3aef26846488f98110cb322ac6e9dda43649e993 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
This merges merely the provisioning changes needed to perform cmake
builds in the CI. The platform configuration changes will be applied
incremental as we merge support in the individual modules.
Conflicts:
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Added ninja to
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
just to force re-provisioning.
Removed module_config.yaml because that breaks license check in
qmake builds.
Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh')
| -rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b956d6a3..6b569552 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -38,13 +38,20 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +sudo yum-config-manager --enable rhel-server-rhscl-7-rpms + installPackages=() -installPackages+=(git) +installPackages+=(rh-git29) installPackages+=(zlib-devel) installPackages+=(glib2-devel) installPackages+=(openssl-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) @@ -118,6 +125,9 @@ installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" +scl enable rh-git29 bash +sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git + sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 # We shouldn't use yum to install virtualenv. The one found from package repo is not |