diff options
-rw-r--r-- | .gitlab-ci-main.yml | 4 | ||||
-rw-r--r-- | bootstrap/config.py | 2 | ||||
-rwxr-xr-x | bootstrap/generated-dists/centos7/bootstrap.sh | 2 | ||||
-rw-r--r-- | bootstrap/generated-dists/centos7/packages.yml | 2 | ||||
-rw-r--r-- | bootstrap/sha1sum.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index c532069af52..dc46d4beaeb 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -42,7 +42,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 791e89a43f2b287635e128c8f5aed924b757c4bd + SAMBA_CI_CONTAINER_TAG: 44771060ac5c91a1feb9a85a7b722893b6f8d843 # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. @@ -592,7 +592,7 @@ centos7-samba-o3: # Git on CentOS doesn't support shallow git cloning GIT_DEPTH: "" # We need a newer GnuTLS version on CentOS7 - PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls34/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig" + PKG_CONFIG_PATH: "/usr/lib64/compat-gnutls37/pkgconfig:/usr/lib64/compat-nettle32/pkgconfig" centos8-samba-o3: extends: .samba-o3-template diff --git a/bootstrap/config.py b/bootstrap/config.py index d9943dd515a..621912a7d94 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -454,7 +454,7 @@ RPM_DISTS = { 'glusterfs-api-devel': '', 'glusterfs-devel': '', 'libcephfs-devel': '', - 'gnutls-devel': 'compat-gnutls34-devel', + 'gnutls-devel': 'compat-gnutls37-devel', 'liburing-devel': '', # not available 'python3-setproctitle': 'python36-setproctitle', 'tracker-devel': '', # do not install diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index c31137e75c2..43572bb532a 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -24,7 +24,7 @@ yum install -y \ bison \ ccache \ chrpath \ - compat-gnutls34-devel \ + compat-gnutls37-devel \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index eebeb2feaa3..3998c875057 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -10,7 +10,7 @@ packages: - bison - ccache - chrpath - - compat-gnutls34-devel + - compat-gnutls37-devel - cups-devel - curl - dbus-devel diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index a4a0de426b1..22c597c2361 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -791e89a43f2b287635e128c8f5aed924b757c4bd +44771060ac5c91a1feb9a85a7b722893b6f8d843 |