Fix Rocky8 build for utf8proc-devel

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 80d30425d155ff159bfa3371ea50e000b2cf0984..8220840d74118f601d888b844d6be207afe724ea 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -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

diff --git a/bootstrap/config.py b/bootstrap/config.py
index d25fbfd6a3602dc8b1397f445d345e7a1f309641..8b2672f9dddb7d49cf7eda31aefa90fa2de3b3bf 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -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': {

diff --git a/bootstrap/generated-dists/rocky8/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh
index 94219d810910ccd08729c7517d21200a10b071e8..e8f632581d7f24a77a8de483f1483ef125259d86 100755 (executable)
--- a/bootstrap/generated-dists/rocky8/bootstrap.sh
+++ b/bootstrap/generated-dists/rocky8/bootstrap.sh
@@ -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 \

diff --git a/bootstrap/generated-dists/rocky8/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml
index eba6d0df51ce43369e89579974a3fe3c7f0dd85a..cd91a67f11a4dfe43261684b77a1f48172bb2eea 100644 (file)
--- a/bootstrap/generated-dists/rocky8/packages.yml
+++ b/bootstrap/generated-dists/rocky8/packages.yml
@@ -100,6 +100,7 @@ packages:
   - tar
   - tracker-devel
   - tree
+  - utf8proc-devel
   - wget
   - which
   - xfsprogs-devel

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 5c42c3950cdf27c987a44723d4b2f068aa6ec6a3..25a8e482d2cc10aa02fec467e08fc324c084e26b 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-38de01039fd443a1392050bdd4eab6cdc83f2e53
+936722ecb26bedf6ea0acd9228963ce45ed419d4