mirror of
https://github.com/samba-team/samba.git
synced 2025-01-03 01:18:10 +03:00
bootstrap: use compat-gnutls37-devel for centos7
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
parent
f60780c8b6
commit
d0aa04e8c1
@ -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
|
||||
|
@ -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
|
||||
|
@ -24,7 +24,7 @@ yum install -y \
|
||||
bison \
|
||||
ccache \
|
||||
chrpath \
|
||||
compat-gnutls34-devel \
|
||||
compat-gnutls37-devel \
|
||||
cups-devel \
|
||||
curl \
|
||||
dbus-devel \
|
||||
|
@ -10,7 +10,7 @@ packages:
|
||||
- bison
|
||||
- ccache
|
||||
- chrpath
|
||||
- compat-gnutls34-devel
|
||||
- compat-gnutls37-devel
|
||||
- cups-devel
|
||||
- curl
|
||||
- dbus-devel
|
||||
|
@ -1 +1 @@
|
||||
791e89a43f2b287635e128c8f5aed924b757c4bd
|
||||
44771060ac5c91a1feb9a85a7b722893b6f8d843
|
||||
|
Loading…
Reference in New Issue
Block a user