bootstrap: Add heimdal-multidev for Debian and Ubuntu

This is required for testing the build with the
configure option --with-system-heimdalkrb5.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14179

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32d6621f4c39c31490243a76a260ace8c37a5398..ab0f0fcc4782cd6bf76658695061bf934293cc80 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: 03db699647966be88fc347206474f3579faae671
+  SAMBA_CI_CONTAINER_TAG: 187702e2a9c65f874aa13e5eb1c8b68703e72299
   #
   # 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 f6a7dd1123f10a49194c17658d661249f68e1324..06fd1142f948f54cde1069c317c370431c2af4a7 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -101,6 +101,7 @@ PKGS = [
     ('libunwind-dev', 'libunwind-devel'),  # for back trace
     ('libglib2.0-dev', 'glib2-devel'),
     ('libicu-dev', 'libicu-devel'),
+    ('heimdal-multidev', ''),
 
     # NAME1, NAME2
     # for debian, locales provide locale support with language packs

diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index 544d2e9fb5276bb00ccfc624462e4345d4f1c0f8..ea22b863afb16bc98a40ce486c5a6c1e8df91047 100755 (executable)
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
     git \
     glusterfs-common \
     gzip \
+    heimdal-multidev \
     hostname \
     htop \
     krb5-config \

diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index e9fc331d387bd6894a1ceda7eb362d8f81071312..3303e68d87ba14684bdc65a2fe09f48d6528630d 100644 (file)
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -19,6 +19,7 @@ packages:
   - git
   - glusterfs-common
   - gzip
+  - heimdal-multidev
   - hostname
   - htop
   - krb5-config

diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 1c6e1df442b51d6e8e6d018f3c870e71aea1c066..687e7723847dd65681f9ea9033cb818b30613402 100755 (executable)
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
     git \
     glusterfs-common \
     gzip \
+    heimdal-multidev \
     hostname \
     htop \
     krb5-config \

diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 48de01ff2bbbddfaffec59fb24048fc7b0c1c1c5..008d58c9514a6c33fd892e23faa3d72c65999044 100644 (file)
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -19,6 +19,7 @@ packages:
   - git
   - glusterfs-common
   - gzip
+  - heimdal-multidev
   - hostname
   - htop
   - krb5-config

diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index d1bc05093610a6523ded7ed5ad3d6e148db166d2..6970c477b38fd8f15e0013cc5e3089e1c8ee1b88 100755 (executable)
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
     git \
     glusterfs-common \
     gzip \
+    heimdal-multidev \
     hostname \
     htop \
     krb5-config \

diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index ee0e239eaf0ab855a4b4c2bed7f2d8cf014b7849..5943f28704bf24c7c463079771f542f33284c083 100644 (file)
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -19,6 +19,7 @@ packages:
   - git
   - glusterfs-common
   - gzip
+  - heimdal-multidev
   - hostname
   - htop
   - krb5-config

diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 656c056b5e5c9a9dda8b5ff928bd30125ff28294..e671c7a50c0ff5affe8481669574c1d4748be58a 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -29,6 +29,7 @@ apt-get -y install \
     gdb \
     git \
     gzip \
+    heimdal-multidev \
     hostname \
     htop \
     krb5-config \

diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index d45866773e30a5b2e1cc9c19edce4a9af1218294..af577b3a32986edea236b4c04f7c523c86c1cb81 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -18,6 +18,7 @@ packages:
   - gdb
   - git
   - gzip
+  - heimdal-multidev
   - hostname
   - htop
   - krb5-config

diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index f4f3ac23d5591634c4f25cf1a7eec8c52c3028ad..cfac3a062116c1fc8604778396b9894d0bfb7444 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -29,6 +29,7 @@ apt-get -y install \
     gdb \
     git \
     gzip \
+    heimdal-multidev \
     hostname \
     htop \
     krb5-config \

diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index 8330b9b8059c2fd6f683cfc005e0e8fa14dd800f..7efddb7bbbd0f032d253dad98ea1113386a902a1 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -18,6 +18,7 @@ packages:
   - gdb
   - git
   - gzip
+  - heimdal-multidev
   - hostname
   - htop
   - krb5-config

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 0f473661e6b661e42232b0e9d23f151e9f65b0df..0e5c611665b281d012b3dd3df3354035ffe64f77 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -30,6 +30,7 @@ apt-get -y install \
     git \
     glusterfs-common \
     gzip \
+    heimdal-multidev \
     hostname \
     htop \
     krb5-config \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index a723aad16c117af71caca471b2ee2bda21c833cb..2045f092f16a0b3770e3e5a4df815e76571cb218 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -19,6 +19,7 @@ packages:
   - git
   - glusterfs-common
   - gzip
+  - heimdal-multidev
   - hostname
   - htop
   - krb5-config

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index bb8e1d4a31add35e8f61df50c6acff7878651ab5..b220ebdde0c904bb2f8d100a85f2afb0abf8a85f 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-03db699647966be88fc347206474f3579faae671
+187702e2a9c65f874aa13e5eb1c8b68703e72299