1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00

bootstrap: Fix centos7 image creation

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Nov  6 13:35:17 UTC 2019 on sn-devel-184
This commit is contained in:
Andreas Schneider 2019-11-06 08:43:05 +01:00 committed by Andreas Schneider
parent 6a3b19fb17
commit 35bb734d63
5 changed files with 5 additions and 4 deletions

View File

@ -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: 19ca94dcfefa6aac39fead8d2a7a0f48d9ce4f8a
SAMBA_CI_CONTAINER_TAG: 539cd9023fee0703a42dc82e8778a01149fcb679
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.

View File

@ -487,6 +487,7 @@ RPM_DISTS = {
'glusterfs-api-devel': '',
'glusterfs-devel': '',
'libcephfs-devel': '',
'nettle-devel': 'compat-nettle32-devel',
'gnutls-devel': 'compat-gnutls34-devel',
}
},

View File

@ -23,6 +23,7 @@ yum install -y \
binutils \
bison \
compat-gnutls34-devel \
compat-nettle32-devel \
cups-devel \
curl \
dbus-devel \
@ -66,7 +67,6 @@ yum install -y \
make \
mingw64-gcc \
ncurses-devel \
nettle-devel \
openldap-devel \
pam-devel \
patch \

View File

@ -9,6 +9,7 @@ packages:
- binutils
- bison
- compat-gnutls34-devel
- compat-nettle32-devel
- cups-devel
- curl
- dbus-devel
@ -52,7 +53,6 @@ packages:
- make
- mingw64-gcc
- ncurses-devel
- nettle-devel
- openldap-devel
- pam-devel
- patch

View File

@ -1 +1 @@
19ca94dcfefa6aac39fead8d2a7a0f48d9ce4f8a
539cd9023fee0703a42dc82e8778a01149fcb679