diff options
| author | Andreas Schneider <asn@samba.org> | 2019-11-06 08:43:05 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-11-06 13:35:17 +0000 |
| commit | 35bb734d638e273f2fd1a19220db5f200d3e7489 (patch) | |
| tree | b49c004613d10db95c138cc8510768d445590230 | |
| parent | 6a3b19fb170d13aaed92645866af75cc508d0991 (diff) | |
| download | samba-35bb734d638e273f2fd1a19220db5f200d3e7489.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | bootstrap/config.py | 1 | ||||
| -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, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de8f7461579..e12f9ebf903 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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. diff --git a/bootstrap/config.py b/bootstrap/config.py index 82234388963..eb1d2b4a9a0 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -487,6 +487,7 @@ RPM_DISTS = { 'glusterfs-api-devel': '', 'glusterfs-devel': '', 'libcephfs-devel': '', + 'nettle-devel': 'compat-nettle32-devel', 'gnutls-devel': 'compat-gnutls34-devel', } }, diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index 629a88018bb..6e3bbd288b1 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -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 \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index 57464db7bb0..3c095961b2a 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -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 diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 2962f3added..02df7bd88ea 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -19ca94dcfefa6aac39fead8d2a7a0f48d9ce4f8a +539cd9023fee0703a42dc82e8778a01149fcb679 |