sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

bootstrap: make sure we have gnutls-cli from gnutls-bin/gnutls-utils

Browse Source 
We'll use it in some upcoming tests...

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2023-06-09 14:07:06 +02:00 committed by Andrew Bartlett
parent 62e189825e
commit cd0f9fc7a3
21 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci-main.yml
View File

@ -47,7 +47,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt # Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render # which is generated by bootstrap/template.py --render
# #
SAMBA_CI_CONTAINER_TAG: 0b8b0640b6475650c8db301236c03c9ad732f52e SAMBA_CI_CONTAINER_TAG: cf0a5476a4f13d449a7542d01d225dc2aef2a333
# #
# We use the ubuntu2204 image as default as # We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224 # it matches what we have on atb-devel-224

3
bootstrap/config.py
View File

@ -97,6 +97,7 @@ PKGS = [
('libgpgme11-dev', 'gpgme-devel'), ('libgpgme11-dev', 'gpgme-devel'),
# NOTE: Debian 8+ and Ubuntu 14.04+ # NOTE: Debian 8+ and Ubuntu 14.04+
('libgnutls28-dev', 'gnutls-devel'), ('libgnutls28-dev', 'gnutls-devel'),
('gnutls-bin', 'gnutls-utils'),
('libtasn1-bin', 'libtasn1-tools'), ('libtasn1-bin', 'libtasn1-tools'),
('libtasn1-dev', 'libtasn1-devel'), ('libtasn1-dev', 'libtasn1-devel'),
('', 'quota-devel'), ('', 'quota-devel'),
@ -486,6 +487,7 @@ RPM_DISTS = {
'glusterfs-devel': '', 'glusterfs-devel': '',
'libcephfs-devel': '', 'libcephfs-devel': '',
'gnutls-devel': 'compat-gnutls37-devel', 'gnutls-devel': 'compat-gnutls37-devel',
'gnutls-utils': 'compat-gnutls37-utils',
'liburing-devel': '', # not available 'liburing-devel': '', # not available
'python3-setproctitle': 'python36-setproctitle', 'python3-setproctitle': 'python36-setproctitle',
'tracker-devel': '', # do not install 'tracker-devel': '', # do not install
@ -549,6 +551,7 @@ RPM_DISTS = {
'python3-markdown': 'python3-Markdown', 'python3-markdown': 'python3-Markdown',
'quota-devel': '', 'quota-devel': '',
'glusterfs-api-devel': '', 'glusterfs-api-devel': '',
'gnutls-utils': 'gnutls',
'libtasn1-tools': '', # asn1Parser is part of libtasn1 'libtasn1-tools': '', # asn1Parser is part of libtasn1
'mold': '', 'mold': '',
'shfmt': '', 'shfmt': '',

1
bootstrap/generated-dists/centos7/bootstrap.sh
View File

@ -25,6 +25,7 @@ yum install -y \
ccache \ ccache \
chrpath \ chrpath \
compat-gnutls37-devel \ compat-gnutls37-devel \
compat-gnutls37-utils \
crypto-policies-scripts \ crypto-policies-scripts \
cups-devel \ cups-devel \
curl \ curl \

1
bootstrap/generated-dists/centos7/packages.yml
View File

@ -11,6 +11,7 @@ packages:
- ccache - ccache
- chrpath - chrpath
- compat-gnutls37-devel - compat-gnutls37-devel
- compat-gnutls37-utils
- crypto-policies-scripts - crypto-policies-scripts
- cups-devel - cups-devel
- curl - curl

1
bootstrap/generated-dists/centos8s/bootstrap.sh
View File

@ -45,6 +45,7 @@ yum install -y \
glusterfs-api-devel \ glusterfs-api-devel \
glusterfs-devel \ glusterfs-devel \
gnutls-devel \ gnutls-devel \
gnutls-utils \
gpgme-devel \ gpgme-devel \
gzip \ gzip \
hostname \ hostname \

1
bootstrap/generated-dists/centos8s/packages.yml
View File

@ -27,6 +27,7 @@ packages:
- glusterfs-api-devel - glusterfs-api-devel
- glusterfs-devel - glusterfs-devel
- gnutls-devel - gnutls-devel
- gnutls-utils
- gpgme-devel - gpgme-devel
- gzip - gzip
- hostname - hostname

1
bootstrap/generated-dists/debian11/bootstrap.sh
View File

@ -31,6 +31,7 @@ apt-get -y install \
gdb \ gdb \
git \ git \
glusterfs-common \ glusterfs-common \
gnutls-bin \
gzip \ gzip \
heimdal-multidev \ heimdal-multidev \
hostname \ hostname \

1
bootstrap/generated-dists/debian11/packages.yml
View File

@ -20,6 +20,7 @@ packages:
- gdb - gdb
- git - git
- glusterfs-common - glusterfs-common
- gnutls-bin
- gzip - gzip
- heimdal-multidev - heimdal-multidev
- hostname - hostname

1
bootstrap/generated-dists/fedora38/bootstrap.sh
View File

@ -39,6 +39,7 @@ dnf install -y \
glusterfs-api-devel \ glusterfs-api-devel \
glusterfs-devel \ glusterfs-devel \
gnutls-devel \ gnutls-devel \
gnutls-utils \
gpgme-devel \ gpgme-devel \
gzip \ gzip \
hostname \ hostname \

1
bootstrap/generated-dists/fedora38/packages.yml
View File

@ -28,6 +28,7 @@ packages:
- glusterfs-api-devel - glusterfs-api-devel
- glusterfs-devel - glusterfs-devel
- gnutls-devel - gnutls-devel
- gnutls-utils
- gpgme-devel - gpgme-devel
- gzip - gzip
- hostname - hostname

1
bootstrap/generated-dists/opensuse154/bootstrap.sh
View File

@ -36,6 +36,7 @@ zypper --non-interactive install \
glib2-devel \ glib2-devel \
glibc-locale \ glibc-locale \
glusterfs-devel \ glusterfs-devel \
gnutls \
gnutls-devel \ gnutls-devel \
gpgme-devel \ gpgme-devel \
gzip \ gzip \

1
bootstrap/generated-dists/opensuse154/packages.yml
View File

@ -24,6 +24,7 @@ packages:
- glib2-devel - glib2-devel
- glibc-locale - glibc-locale
- glusterfs-devel - glusterfs-devel
- gnutls
- gnutls-devel - gnutls-devel
- gpgme-devel - gpgme-devel
- gzip - gzip

1
bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
View File

@ -31,6 +31,7 @@ apt-get -y install \
gdb \ gdb \
git \ git \
glusterfs-common \ glusterfs-common \
gnutls-bin \
gzip \ gzip \
heimdal-multidev \ heimdal-multidev \
hostname \ hostname \

1
bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
View File

@ -20,6 +20,7 @@ packages:
- gdb - gdb
- git - git
- glusterfs-common - glusterfs-common
- gnutls-bin
- gzip - gzip
- heimdal-multidev - heimdal-multidev
- hostname - hostname

1
bootstrap/generated-dists/ubuntu1804/bootstrap.sh
View File

@ -31,6 +31,7 @@ apt-get -y install \
gdb \ gdb \
git \ git \
glusterfs-common \ glusterfs-common \
gnutls-bin \
gzip \ gzip \
heimdal-multidev \ heimdal-multidev \
hostname \ hostname \

1
bootstrap/generated-dists/ubuntu1804/packages.yml
View File

@ -20,6 +20,7 @@ packages:
- gdb - gdb
- git - git
- glusterfs-common - glusterfs-common
- gnutls-bin
- gzip - gzip
- heimdal-multidev - heimdal-multidev
- hostname - hostname

1
bootstrap/generated-dists/ubuntu2004/bootstrap.sh
View File

@ -31,6 +31,7 @@ apt-get -y install \
gdb \ gdb \
git \ git \
glusterfs-common \ glusterfs-common \
gnutls-bin \
gzip \ gzip \
heimdal-multidev \ heimdal-multidev \
hostname \ hostname \

1
bootstrap/generated-dists/ubuntu2004/packages.yml
View File

@ -20,6 +20,7 @@ packages:
- gdb - gdb
- git - git
- glusterfs-common - glusterfs-common
- gnutls-bin
- gzip - gzip
- heimdal-multidev - heimdal-multidev
- hostname - hostname

1
bootstrap/generated-dists/ubuntu2204/bootstrap.sh
View File

@ -31,6 +31,7 @@ apt-get -y install \
gdb \ gdb \
git \ git \
glusterfs-common \ glusterfs-common \
gnutls-bin \
gzip \ gzip \
heimdal-multidev \ heimdal-multidev \
hostname \ hostname \

1
bootstrap/generated-dists/ubuntu2204/packages.yml
View File

@ -20,6 +20,7 @@ packages:
- gdb - gdb
- git - git
- glusterfs-common - glusterfs-common
- gnutls-bin
- gzip - gzip
- heimdal-multidev - heimdal-multidev
- hostname - hostname

2
bootstrap/sha1sum.txt
View File

@ -1 +1 @@
0b8b0640b6475650c8db301236c03c9ad732f52e cf0a5476a4f13d449a7542d01d225dc2aef2a333