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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de8f74615792ad148da87e87f8b2ebf4be841b14..e12f9ebf903c6288dce820251c21cbe004633f11 100644 (file)
--- 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 82234388963ce54efdd767289c586c1da816b2d5..eb1d2b4a9a01fb9dbc8f1c1b273aa19696fef00b 100644 (file)
--- 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 629a88018bbf601b1e692c8565683288c2ff25c5..6e3bbd288b18cacf7fb8700135970548ae21f0fd 100755 (executable)
--- 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 57464db7bb09dd11db60417127def7cac73ff137..3c095961b2af4be255f1d59567d77703fa670b0a 100644 (file)
--- 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 2962f3added75172a1f2f4dab60b5d3db5ccf130..02df7bd88eaee2a7ecd37f556db3f77090694dd5 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-19ca94dcfefa6aac39fead8d2a7a0f48d9ce4f8a
+539cd9023fee0703a42dc82e8778a01149fcb679