From 2efc243f1ad09eae46f6f99fb0646ecd4356c3f9 Mon Sep 17 00:00:00 2001 From: Christof Schmitt Date: Wed, 30 Oct 2019 13:49:55 -0700 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett --- .gitlab-ci.yml | 2 +- bootstrap/config.py | 1 + bootstrap/generated-dists/debian7/bootstrap.sh | 1 + bootstrap/generated-dists/debian7/packages.yml | 1 + bootstrap/generated-dists/debian8/bootstrap.sh | 1 + bootstrap/generated-dists/debian8/packages.yml | 1 + bootstrap/generated-dists/debian9/bootstrap.sh | 1 + bootstrap/generated-dists/debian9/packages.yml | 1 + bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1404/packages.yml | 1 + bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1604/packages.yml | 1 + bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1804/packages.yml | 1 + bootstrap/sha1sum.txt | 2 +- 15 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32d6621f4c3..ab0f0fcc478 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: 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 f6a7dd1123f..06fd1142f94 100644 --- 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 544d2e9fb52..ea22b863afb 100755 --- 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 e9fc331d387..3303e68d87b 100644 --- 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 1c6e1df442b..687e7723847 100755 --- 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 48de01ff2bb..008d58c9514 100644 --- 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 d1bc0509361..6970c477b38 100755 --- 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 ee0e239eaf0..5943f28704b 100644 --- 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 656c056b5e5..e671c7a50c0 100755 --- 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 d45866773e3..af577b3a329 100644 --- 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 f4f3ac23d55..cfac3a06211 100755 --- 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 8330b9b8059..7efddb7bbbd 100644 --- 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 0f473661e6b..0e5c611665b 100755 --- 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 a723aad16c1..2045f092f16 100644 --- 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 bb8e1d4a31a..b220ebdde0c 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -03db699647966be88fc347206474f3579faae671 +187702e2a9c65f874aa13e5eb1c8b68703e72299 -- 2.47.3