diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-17 14:14:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-17 14:15:23 +0200 |
commit | 4d4159f7b7edf6d9b770a2380a7c32b219873e5d (patch) | |
tree | ac8eeba8f9a463739ad7cdc6ea73b0300c754aaf /coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | |
parent | 24e1a15d40c02d5cd47644d37f713182830dfb4f (diff) | |
parent | 6a06c4b4fe7fad6595252ac035fc0c05627b62c6 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index bf706eb2..a0fa62a9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -63,8 +63,8 @@ installPackages+=(gtk3-devel) installPackages+=(libusbx-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux installPackages+=(speech-dispatcher-devel) -# Python 2.7 with python-devel, pip and virtualenv -installPackages+=(python27) +# Python 2 devel and pip. python-pip requires the EPEL repository to be added +installPackages+=(python-devel python-pip) # Python 3 with python-devel, pip and virtualenv installPackages+=(rh-python36) # WebEngine @@ -89,11 +89,18 @@ installPackages+=(libxml2-devel) installPackages+=(libxslt-devel) # For building Wayland from source installPackages+=(libffi-devel) +# QtWayland +installPackages+=(mesa-libwayland-egl) +installPackages+=(mesa-libwayland-egl-devel) +installPackages+=(libwayland-client) +installPackages+=(libwayland-cursor) +installPackages+=(libwayland-server) sudo yum -y install "${installPackages[@]}" -# Make python 2.7 and its pip default -echo "source scl_source enable python27" >> ~/.bashrc - 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 +# working, but we can use installed pip +sudo pip install --upgrade pip +sudo pip install virtualenv |