mirror of
https://github.com/samba-team/samba.git
synced 2024-12-22 13:34:15 +03:00
bootstrap: Remove nettle-devel from package list
nettle is required as dependency for newer gnutls libraries. The gnutls development package already depends on the nettle development package, no need to explicitly list it. Signed-off-by: Christof Schmit <cs@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Christof Schmitt
parent
816205027a
commit
63f8d77327
@ -22,7 +22,7 @@ variables:
|
||||
# Set this to the contents of bootstrap/sha1sum.txt
|
||||
# which is generated by bootstrap/template.py --render
|
||||
#
|
||||
SAMBA_CI_CONTAINER_TAG: 539cd9023fee0703a42dc82e8778a01149fcb679
|
||||
SAMBA_CI_CONTAINER_TAG: 03db699647966be88fc347206474f3579faae671
|
||||
#
|
||||
# We use the ubuntu1804 image as default as
|
||||
# it matches what we have on sn-devel-184.
|
||||
|
||||
@ -66,7 +66,6 @@ PKGS = [
|
||||
# NAME1-dev, NAME2-devel
|
||||
('lmdb-utils', 'lmdb'),
|
||||
('mingw-w64', 'mingw64-gcc'),
|
||||
('nettle-dev', 'nettle-devel'),
|
||||
('zlib1g-dev', 'zlib-devel'),
|
||||
('libbsd-dev', 'libbsd-devel'),
|
||||
('libaio-dev', 'libaio-devel'),
|
||||
@ -487,7 +486,6 @@ RPM_DISTS = {
|
||||
'glusterfs-api-devel': '',
|
||||
'glusterfs-devel': '',
|
||||
'libcephfs-devel': '',
|
||||
'nettle-devel': 'compat-nettle32-devel',
|
||||
'gnutls-devel': 'compat-gnutls34-devel',
|
||||
}
|
||||
},
|
||||
@ -549,7 +547,6 @@ RPM_DISTS = {
|
||||
'krb5-workstation': 'krb5-client',
|
||||
'libnsl2-devel': 'libnsl-devel',
|
||||
'libsemanage-python': 'python2-semanage',
|
||||
'nettle-devel': 'libnettle-devel',
|
||||
'openldap-devel': 'openldap2-devel',
|
||||
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
|
||||
'perl-JSON-Parse': 'perl-JSON-XS',
|
||||
@ -582,7 +579,6 @@ RPM_DISTS = {
|
||||
'krb5-workstation': 'krb5-client',
|
||||
'libnsl2-devel': 'libnsl-devel',
|
||||
'libsemanage-python': 'python2-semanage',
|
||||
'nettle-devel': 'libnettle-devel',
|
||||
'openldap-devel': 'openldap2-devel',
|
||||
'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
|
||||
'perl-JSON-Parse': 'perl-JSON-XS',
|
||||
|
||||
@ -66,7 +66,6 @@ yum install -y \
|
||||
make \
|
||||
mingw64-gcc \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
openldap-devel \
|
||||
pam-devel \
|
||||
patch \
|
||||
|
||||
@ -52,7 +52,6 @@ packages:
|
||||
- make
|
||||
- mingw64-gcc
|
||||
- ncurses-devel
|
||||
- nettle-devel
|
||||
- openldap-devel
|
||||
- pam-devel
|
||||
- patch
|
||||
|
||||
@ -23,7 +23,6 @@ yum install -y \
|
||||
binutils \
|
||||
bison \
|
||||
compat-gnutls34-devel \
|
||||
compat-nettle32-devel \
|
||||
cups-devel \
|
||||
curl \
|
||||
dbus-devel \
|
||||
|
||||
@ -9,7 +9,6 @@ packages:
|
||||
- binutils
|
||||
- bison
|
||||
- compat-gnutls34-devel
|
||||
- compat-nettle32-devel
|
||||
- cups-devel
|
||||
- curl
|
||||
- dbus-devel
|
||||
|
||||
@ -69,7 +69,6 @@ yum install -y \
|
||||
make \
|
||||
mingw64-gcc \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
openldap-devel \
|
||||
pam-devel \
|
||||
patch \
|
||||
|
||||
@ -54,7 +54,6 @@ packages:
|
||||
- make
|
||||
- mingw64-gcc
|
||||
- ncurses-devel
|
||||
- nettle-devel
|
||||
- openldap-devel
|
||||
- pam-devel
|
||||
- patch
|
||||
|
||||
@ -70,7 +70,6 @@ apt-get -y install \
|
||||
make \
|
||||
mawk \
|
||||
mingw-w64 \
|
||||
nettle-dev \
|
||||
patch \
|
||||
perl \
|
||||
perl-modules \
|
||||
|
||||
@ -59,7 +59,6 @@ packages:
|
||||
- make
|
||||
- mawk
|
||||
- mingw-w64
|
||||
- nettle-dev
|
||||
- patch
|
||||
- perl
|
||||
- perl-modules
|
||||
|
||||
@ -73,7 +73,6 @@ apt-get -y install \
|
||||
make \
|
||||
mawk \
|
||||
mingw-w64 \
|
||||
nettle-dev \
|
||||
patch \
|
||||
perl \
|
||||
perl-modules \
|
||||
|
||||
@ -62,7 +62,6 @@ packages:
|
||||
- make
|
||||
- mawk
|
||||
- mingw-w64
|
||||
- nettle-dev
|
||||
- patch
|
||||
- perl
|
||||
- perl-modules
|
||||
|
||||
@ -73,7 +73,6 @@ apt-get -y install \
|
||||
make \
|
||||
mawk \
|
||||
mingw-w64 \
|
||||
nettle-dev \
|
||||
patch \
|
||||
perl \
|
||||
perl-modules \
|
||||
|
||||
@ -62,7 +62,6 @@ packages:
|
||||
- make
|
||||
- mawk
|
||||
- mingw-w64
|
||||
- nettle-dev
|
||||
- patch
|
||||
- perl
|
||||
- perl-modules
|
||||
|
||||
@ -67,7 +67,6 @@ dnf install -y \
|
||||
make \
|
||||
mingw64-gcc \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
openldap-devel \
|
||||
pam-devel \
|
||||
patch \
|
||||
|
||||
@ -56,7 +56,6 @@ packages:
|
||||
- make
|
||||
- mingw64-gcc
|
||||
- ncurses-devel
|
||||
- nettle-devel
|
||||
- openldap-devel
|
||||
- pam-devel
|
||||
- patch
|
||||
|
||||
@ -67,7 +67,6 @@ dnf install -y \
|
||||
make \
|
||||
mingw64-gcc \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
openldap-devel \
|
||||
pam-devel \
|
||||
patch \
|
||||
|
||||
@ -56,7 +56,6 @@ packages:
|
||||
- make
|
||||
- mingw64-gcc
|
||||
- ncurses-devel
|
||||
- nettle-devel
|
||||
- openldap-devel
|
||||
- pam-devel
|
||||
- patch
|
||||
|
||||
@ -66,7 +66,6 @@ dnf install -y \
|
||||
make \
|
||||
mingw64-gcc \
|
||||
ncurses-devel \
|
||||
nettle-devel \
|
||||
openldap-devel \
|
||||
pam-devel \
|
||||
patch \
|
||||
|
||||
@ -55,7 +55,6 @@ packages:
|
||||
- make
|
||||
- mingw64-gcc
|
||||
- ncurses-devel
|
||||
- nettle-devel
|
||||
- openldap-devel
|
||||
- pam-devel
|
||||
- patch
|
||||
|
||||
@ -51,7 +51,6 @@ zypper --non-interactive install \
|
||||
libcephfs-devel \
|
||||
libicu-devel \
|
||||
libjansson-devel \
|
||||
libnettle-devel \
|
||||
libnsl-devel \
|
||||
libpcap-devel \
|
||||
libtasn1-devel \
|
||||
|
||||
@ -39,7 +39,6 @@ packages:
|
||||
- libcephfs-devel
|
||||
- libicu-devel
|
||||
- libjansson-devel
|
||||
- libnettle-devel
|
||||
- libnsl-devel
|
||||
- libpcap-devel
|
||||
- libtasn1-devel
|
||||
|
||||
@ -51,7 +51,6 @@ zypper --non-interactive install \
|
||||
libcephfs-devel \
|
||||
libicu-devel \
|
||||
libjansson-devel \
|
||||
libnettle-devel \
|
||||
libnsl-devel \
|
||||
libpcap-devel \
|
||||
libtasn1-devel \
|
||||
|
||||
@ -39,7 +39,6 @@ packages:
|
||||
- libcephfs-devel
|
||||
- libicu-devel
|
||||
- libjansson-devel
|
||||
- libnettle-devel
|
||||
- libnsl-devel
|
||||
- libpcap-devel
|
||||
- libtasn1-devel
|
||||
|
||||
@ -71,7 +71,6 @@ apt-get -y install \
|
||||
make \
|
||||
mawk \
|
||||
mingw-w64 \
|
||||
nettle-dev \
|
||||
patch \
|
||||
perl \
|
||||
perl-modules \
|
||||
|
||||
@ -60,7 +60,6 @@ packages:
|
||||
- make
|
||||
- mawk
|
||||
- mingw-w64
|
||||
- nettle-dev
|
||||
- patch
|
||||
- perl
|
||||
- perl-modules
|
||||
|
||||
@ -72,7 +72,6 @@ apt-get -y install \
|
||||
make \
|
||||
mawk \
|
||||
mingw-w64 \
|
||||
nettle-dev \
|
||||
patch \
|
||||
perl \
|
||||
perl-modules \
|
||||
|
||||
@ -61,7 +61,6 @@ packages:
|
||||
- make
|
||||
- mawk
|
||||
- mingw-w64
|
||||
- nettle-dev
|
||||
- patch
|
||||
- perl
|
||||
- perl-modules
|
||||
|
||||
@ -74,7 +74,6 @@ apt-get -y install \
|
||||
make \
|
||||
mawk \
|
||||
mingw-w64 \
|
||||
nettle-dev \
|
||||
patch \
|
||||
perl \
|
||||
perl-modules \
|
||||
|
||||
@ -63,7 +63,6 @@ packages:
|
||||
- make
|
||||
- mawk
|
||||
- mingw-w64
|
||||
- nettle-dev
|
||||
- patch
|
||||
- perl
|
||||
- perl-modules
|
||||
|
||||
@ -1 +1 @@
|
||||
539cd9023fee0703a42dc82e8778a01149fcb679
|
||||
03db699647966be88fc347206474f3579faae671
|
||||
|
||||
Loading…
Reference in New Issue
Block a user