mirror of
https://github.com/samba-team/samba.git
synced 2025-01-03 01:18:10 +03:00
Fix Rocky8 build for utf8proc-devel
Signed-off-by: David Mulder <dmulder@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
parent
8a75cb0e20
commit
0998686355
@ -47,7 +47,7 @@ variables:
|
||||
# Set this to the contents of bootstrap/sha1sum.txt
|
||||
# which is generated by bootstrap/template.py --render
|
||||
#
|
||||
SAMBA_CI_CONTAINER_TAG: 38de01039fd443a1392050bdd4eab6cdc83f2e53
|
||||
SAMBA_CI_CONTAINER_TAG: 936722ecb26bedf6ea0acd9228963ce45ed419d4
|
||||
#
|
||||
# We use the ubuntu2204 image as default as
|
||||
# it matches what we have on atb-devel-224
|
||||
|
@ -248,6 +248,11 @@ set -xueo pipefail
|
||||
yum update -y
|
||||
yum install -y dnf-plugins-core
|
||||
yum install -y epel-release
|
||||
yum install -y centos-release-ceph-pacific
|
||||
|
||||
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Ceph-*
|
||||
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Ceph-*
|
||||
sed -i 's/$contentdir/centos/g' /etc/yum.repos.d/CentOS-Ceph-*
|
||||
|
||||
yum -v repolist all
|
||||
yum config-manager --set-enabled powertools -y
|
||||
@ -256,6 +261,7 @@ yum update -y
|
||||
|
||||
yum install -y \
|
||||
--setopt=install_weak_deps=False \
|
||||
--setopt=centos-ceph-pacific.module_hotfixes=true \
|
||||
{pkgs}
|
||||
|
||||
yum clean all
|
||||
@ -528,7 +534,6 @@ RPM_DISTS = {
|
||||
'ShellCheck': '',
|
||||
'shfmt': '',
|
||||
'codespell': '',
|
||||
'utf8proc-devel': '',
|
||||
}
|
||||
},
|
||||
'centos9s': {
|
||||
|
@ -10,6 +10,11 @@ set -xueo pipefail
|
||||
yum update -y
|
||||
yum install -y dnf-plugins-core
|
||||
yum install -y epel-release
|
||||
yum install -y centos-release-ceph-pacific
|
||||
|
||||
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Ceph-*
|
||||
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Ceph-*
|
||||
sed -i 's/$contentdir/centos/g' /etc/yum.repos.d/CentOS-Ceph-*
|
||||
|
||||
yum -v repolist all
|
||||
yum config-manager --set-enabled powertools -y
|
||||
@ -18,6 +23,7 @@ yum update -y
|
||||
|
||||
yum install -y \
|
||||
--setopt=install_weak_deps=False \
|
||||
--setopt=centos-ceph-pacific.module_hotfixes=true \
|
||||
"@Development Tools" \
|
||||
acl \
|
||||
attr \
|
||||
@ -118,6 +124,7 @@ yum install -y \
|
||||
tar \
|
||||
tracker-devel \
|
||||
tree \
|
||||
utf8proc-devel \
|
||||
wget \
|
||||
which \
|
||||
xfsprogs-devel \
|
||||
|
@ -100,6 +100,7 @@ packages:
|
||||
- tar
|
||||
- tracker-devel
|
||||
- tree
|
||||
- utf8proc-devel
|
||||
- wget
|
||||
- which
|
||||
- xfsprogs-devel
|
||||
|
@ -1 +1 @@
|
||||
38de01039fd443a1392050bdd4eab6cdc83f2e53
|
||||
936722ecb26bedf6ea0acd9228963ce45ed419d4
|
||||
|
Loading…
Reference in New Issue
Block a user