Commit Graph

19 Commits

Author SHA1 Message Date
Juha Karjalainen
f4b482d844 Provision: install unixodbc-devel library
Adds odbc support for rhel7.

Task-number: QTBUG-72444
Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-08 15:09:55 +00:00
Gatis Paeglis
22e5bda9a9 provisioning: RHEL-7.4 install xcb-util-* packages
We do install them on Ubuntu and openSUSE. Eventually we want to stop
using bundled xcb libraries. Currently all builds of Qt on Linux use
-qt-xcb switch (see coin/src/targetenvironments.py::LinuxTargetEnvironment),
which is the reason why things build fine, even when packages are not
present on the system.

Change-Id: I856ddb5a17768b347aec3e593d6b969109a5c3a3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-29 20:20:13 +00:00
Gatis Paeglis
d9a869707e provisioning: consistently install libxkbcommon* on linux distros
Ubuntu was the only distro that installed both of the required packages:

installPackages+=(libxkbcommon-dev)
installPackages+=(libxkbcommon-x11-dev)

RHEL 7.4 did not explicitly install any, but got libxkbcommon-dev
pulled in as gtk3 dependency. Extract from provisioning log:

--> Processing Dependency: pkgconfig(xkbcommon) >= 0.2.0 for package: gtk3-devel-3.22.30-3.el7.x86_64
---> Package libxkbcommon-devel.x86_64 0:0.7.1-1.el7 will be installed

openSUSE explicitly installed libxkbcommon-devel, but not libxkbcommon-x11-devel.

Qt official binaries are built on RHEL, where we do not have
libxkbcommon-x11-dev installed. This means that XCB plugin and
Compose input plugin would fallback to using bundled sources.
It was actually desired until now that XCB/Compose use the
bundled sources instead of linking with the library from the
system, but this was only a lucky side effect. If we had installed
libxkbcommon-x11-dev on RHEL, then Qt binaries would end up
linking with the libxkbcommon from the system, because of the
missing "-qt-xkbcommon" configre switch for release builds.
We won't bundle libxkbcommon anymore, hence we need to install
the missing dependencies, as done by this patch.

Change-Id: I5c7b8ac38c266ce81cb5a3189a9082bfd581ee31
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-29 20:19:57 +00:00
Heikki Halmet
abe69c34bb Provisioning: Install chrpath for Jenkins
Task-number: QTQAINFRA-2270
Change-Id: I5afd9c6682ff6acb040ee069f3d7a179260f71d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-06 17:34:02 +00:00
Dominik Holland
7fe274f6f6 Correctly use pip3 to setup a wheel cache for python3 packages on linux
Previously pip was used (instead of pip3) which caused that python2
packages were installed into the python3 wheel cache folder. Some of
the packages also worked for python3, but not all of them.

Task-number: AUTOSUITE-195
Change-Id: I393d036667b14e11dee65975ba6933e7174d0e9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:59 +00:00
Liang Qi
d746bc3ea8 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
2018-08-06 11:31:33 +02:00
Frederik Gladhorn
b6fd915b26 Remove packagekit (update notifications) from RHEL 7.4
PackageKit and gnome-software run in the background and at some point
will show popups to ask the user to update.

Change-Id: I99a3314c8788c7cc06e479718306a822bf255fbd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-07-31 15:09:08 +00:00
Dominik Holland
f9f9e0944d Download and cache needed python wheels during provisioning
Instead of downloading the packages during the compile/configure
step setup a wheel cache folder during the provisioning phase

Task-number: AUTOSUITE-195
Change-Id: I465f1be7cdd351e7680dcd8ae22d5e97ddf8cb2d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-31 14:36:41 +00:00
Simo Fält
6a06c4b4fe Revert "Install Python 2.7.13 to RHEL with pip"
This reverts commit 794913dde7,
which seems to break pyside builds. Instead we install python-pip
package from the EPEL repository.

Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-16 03:32:20 +00:00
Heikki Halmet
f9e9dd1393 Provisioning: Use wayland libs provided by distro
Redhat repositories includes needed wayland
libraries. Let's use those instead providing
those through provisioning.


Task-number: QTQAINFRA-1925
Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:42 +00:00
Tony Sarajärvi
daeaec9b3c Remove updating of RHEL 7.4 system during each provisioning
Yum update doesn't only fetch the repository data. It also runs
a distro upgrade. So if something gets updated that isn't
compatible with us, it breaks. It also slows down the provisioning
a lot.

Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 19:41:19 +00:00
Tony Sarajärvi
794913dde7 Install Python 2.7.13 to RHEL with pip
System's default Python is 2.7.5 and doesn't come
with pip at all. To install its pip, it would require us to
enable the EPEL repository and install it from there.

The repos we use already include Python 2.7.13. If we install that
we get pip as well.

Change-Id: I083a970697a962ddb301616695c2cf419f1229f8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:42 +00:00
Tony Sarajärvi
f1eca9bbff Remove duplicate python-devel provisioning from RHEL 7.x
Change-Id: I445135d675fa6b5cb305f6aadf5b754ab248a1ff
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:33 +00:00
Frederik Gladhorn
9ae91ae3f8 Update Python 3.4 to 3.6 in RHEL 7.x
Also install Python 3 through system packages instead
of some weird scripts.

Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:26 +00:00
Kari Oikarinen
140c6479b5 Install libusbx-devel for QDB on RHEL 7.4
On previous RHEL version the package was libusb1-devel. That package doesn't
seem to be there anymore, which presumably means why the package to install was
changed to libusb-devel. Unfortunately libusb-devel provides a compatibility
package for the old 0.1 API version and doesn't work with QDB. libusbx-devel
seems to be the new name for the 1.0 API version of libusb on RHEL.

Change-Id: I50a10bed0b73b536e5d591363f01d7cf6a3a69d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-02-27 13:47:58 +00:00
Johan Klokkhammer Helsing
08c88de5c8 Provisioning: Build and install Wayland 1.12.0 on RHEL 7.4
So QtWayland will be built and included in the installer.

wayland-egl, however, will not be built, as that depends on support in mesa.

Task-number: QTBUG-66341
Change-Id: Id3f1825e00be9d278fce8ac2710a2640baafd332
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:41 +00:00
Liang Qi
2a39f8e5fe Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
2018-01-06 09:08:20 +01:00
Tony Sarajärvi
b9aae857f9 Fix shebangs and give provisioning scripts +x rights
Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:29 +00:00
Joni Jantti
19f8a741f3 Make provisioning script prefix style match across platforms
Currently we are using different styles and amount of digits for the
provisioning script prefixes. This change will unify them across the
platforms. Also removes a couple of duplicate files.

Task-number: QTQAINFRA-1668
Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-29 13:16:40 +00:00