lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 20:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Take RHEL 10.0 specific release subdirectory into use

Browse Source 
To fix
  - Release lock --set=10.0 doesn't work with internal repo
  - Also locks epel repo to same release version 10.0

Other notes:

7zip is downgraded from 25.01-1.el10_1 to 24.09-4.el10_0. As a result,
the snld switch (introduced in 7zip 25.01) is no longer required.

Pick-to: 6.11
Task-number: QTQAINFRA-7817
Task-number: QTQAINFRA-7614
Change-Id: Ib2daed8cbb6d53e593cb0c835b0cbc4b40fa5f9d
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
This commit is contained in:
Tero Heikkinen
2026-04-16 08:25:19 +03:00
parent 23b2017121
commit 007c887d88
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
coin/provisioning/qtci-linux-RHEL-10.0-x86_64/03-enable-repos.sh
View File

@@ -22,13 +22,15 @@ sudo subscription-manager release --list
# Do not update Tier 1 via GUI without using this same --set # Do not update Tier 1 via GUI without using this same --set
# - To avoid System to have newer packages than RPMS which will cause update issues # - To avoid System to have newer packages than RPMS which will cause update issues
# - Note! This will only work with RHEL official RPMs - Not with internal repo clones
sudo subscription-manager release --set=10.0 sudo subscription-manager release --set=10.0
sudo yum clean all sudo yum clean all
# Internal repo-clones must have exact release numbers to lock packages correctly
sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
[rhel-10-for-x86_64-baseos-rpms] [rhel-10-for-x86_64-baseos-rpms]
metadata_expire = 86400 metadata_expire = 86400
baseurl = http://repo-clones-rhel10.ci.qt.io/rhel-10-for-x86_64-baseos-rpms baseurl = http://repo-clones-rhel10.ci.qt.io/10.0/rhel-10-for-x86_64-baseos-rpms
ui_repoid_vars = releasever basearch ui_repoid_vars = releasever basearch
name = Qt Red Hat Enterprise Linux 10 Base OS (RPMs) name = Qt Red Hat Enterprise Linux 10 Base OS (RPMs)
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
@@ -37,7 +39,7 @@ gpgcheck = 1
[rhel-10-for-x86_64-appstream-rpms] [rhel-10-for-x86_64-appstream-rpms]
metadata_expire = 86400 metadata_expire = 86400
baseurl = http://repo-clones-rhel10.ci.qt.io/rhel-10-for-x86_64-appstream-rpms baseurl = http://repo-clones-rhel10.ci.qt.io/10.0/rhel-10-for-x86_64-appstream-rpms
ui_repoid_vars = releasever basearch ui_repoid_vars = releasever basearch
name = Qt Red Hat Enterprise Linux 10 Appstream (RPMs) name = Qt Red Hat Enterprise Linux 10 Appstream (RPMs)
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
@@ -46,7 +48,7 @@ gpgcheck = 1
[codeready-builder-for-rhel-10-x86_64-rpms] [codeready-builder-for-rhel-10-x86_64-rpms]
metadata_expire = 86400 metadata_expire = 86400
baseurl = http://repo-clones-rhel10.ci.qt.io/codeready-builder-for-rhel-10-x86_64-rpms baseurl = http://repo-clones-rhel10.ci.qt.io/10.0/codeready-builder-for-rhel-10-x86_64-rpms
ui_repoid_vars = releasever basearch ui_repoid_vars = releasever basearch
name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs) name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
@@ -54,9 +56,18 @@ enabled = 1
gpgcheck = 1 gpgcheck = 1
EOC EOC
# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip' # Epel repo must have exact release number to lock packages correctly
sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm sudo tee "/etc/yum.repos.d/epel-10.0.repo" > /dev/null <<EOC
[epel-10.0]
name = Extra Packages for Enterprise Linux 10.0 (Qt pinned)
baseurl = https://dl.fedoraproject.org/pub/epel/10.0/Everything/x86_64/
enabled = 1
sudo yum clean all gpgcheck = 1
# As well as this fetching the repository data, we also get a printout of the used repos repo_gpgcheck = 0
sudo yum repolist gpgkey = https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-10
metadata_expire = 86400
skip_if_unavailable = false
priority = 90
EOC

2
coin/provisioning/qtci-linux-RHEL-10.0-x86_64/05-libclang-dyn.sh
View File

@@ -5,4 +5,4 @@ set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang-dyn.sh # shellcheck source=../common/unix/libclang-dyn.sh
"$BASEDIR/../common/unix/libclang-dyn.sh" "-snld10" "$BASEDIR/../common/unix/libclang-dyn.sh"

2
coin/provisioning/qtci-linux-RHEL-10.0-x86_64/05-libclang.sh
View File

@@ -5,4 +5,4 @@ set -ex
BASEDIR=$(dirname "$0") BASEDIR=$(dirname "$0")
# shellcheck source=../common/unix/libclang.sh # shellcheck source=../common/unix/libclang.sh
"$BASEDIR/../common/unix/libclang.sh" "-snld10" "$BASEDIR/../common/unix/libclang.sh"

4
coin/provisioning/qtci-linux-RHEL-10.0-x86_64/30-install_icu.sh
View File

@@ -23,7 +23,7 @@ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
targetFile=$(mktemp) targetFile=$(mktemp)
DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
sudo 7z x -snld10 -y -o/usr/lib64 "$targetFile" sudo 7z x -y -o/usr/lib64 "$targetFile"
sudo rm "$targetFile" sudo rm "$targetFile"
echo "Installing custom ICU devel packages on RHEL" echo "Installing custom ICU devel packages on RHEL"
@@ -32,7 +32,7 @@ tempDir=$(mktemp -d)
targetFile=$(mktemp) targetFile=$(mktemp)
DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile"
7z x -snld10 -y -o"$tempDir" "$targetFile" 7z x -y -o"$tempDir" "$targetFile"
sudo cp -a "$tempDir"/lib/* /usr/lib64 sudo cp -a "$tempDir"/lib/* /usr/lib64
sudo cp -a "$tempDir"/* /usr/ sudo cp -a "$tempDir"/* /usr/