diff options
23 files changed, 26 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbf329178b4..dfa1f6423d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,9 +22,11 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 1185fa2a316b3bb7e0c24e9fb8279d4c17450809 + SAMBA_CI_CONTAINER_TAG: a50a08a6ecfbe1113f3892c0cb3e2646d58a1521 + # # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. + # SAMBA_CI_CONTAINER_IMAGE: ubuntu1804 # # The following images are available diff --git a/bootstrap/config.py b/bootstrap/config.py index bd651e28597..279d1f0a046 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -65,6 +65,7 @@ COMMON = [ PKGS = [ # NAME1-dev, NAME2-devel ('lmdb-utils', 'lmdb'), + ('mingw-w64', 'mingw64-gcc'), ('nettle-dev', 'nettle-devel'), ('zlib1g-dev', 'zlib-devel'), ('libbsd-dev', 'libbsd-devel'), @@ -525,6 +526,7 @@ RPM_DISTS = { 'quota-devel': '', 'glusterfs-api-devel': '', 'libtasn1-tools': '', # asn1Parser is part of libtasn1 + 'mingw64-gcc': '', # doesn't exist } } } diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh index 1279bbce7b9..6d60bd2cdc9 100755 --- a/bootstrap/generated-dists/centos6/bootstrap.sh +++ b/bootstrap/generated-dists/centos6/bootstrap.sh @@ -62,6 +62,7 @@ yum install -y \ lmdb \ lmdb-devel \ make \ + mingw64-gcc \ ncurses-devel \ nettle-devel \ openldap-devel \ diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml index cb60034d299..168fbe9d334 100644 --- a/bootstrap/generated-dists/centos6/packages.yml +++ b/bootstrap/generated-dists/centos6/packages.yml @@ -50,6 +50,7 @@ packages: - lmdb - lmdb-devel - make + - mingw64-gcc - ncurses-devel - nettle-devel - openldap-devel diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index 81786a80bea..b59ef6a5dcf 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -62,6 +62,7 @@ yum install -y \ lmdb \ lmdb-devel \ make \ + mingw64-gcc \ ncurses-devel \ nettle-devel \ openldap-devel \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index 7f10cd38f1c..7a106d8dfd5 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -50,6 +50,7 @@ packages: - lmdb - lmdb-devel - make + - mingw64-gcc - ncurses-devel - nettle-devel - openldap-devel diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh index f506af4c616..4e126cf5e8e 100755 --- a/bootstrap/generated-dists/debian7/bootstrap.sh +++ b/bootstrap/generated-dists/debian7/bootstrap.sh @@ -69,6 +69,7 @@ apt-get -y install \ lsb-release \ make \ mawk \ + mingw-w64 \ nettle-dev \ patch \ perl \ diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml index 645df5a0692..667825c283e 100644 --- a/bootstrap/generated-dists/debian7/packages.yml +++ b/bootstrap/generated-dists/debian7/packages.yml @@ -58,6 +58,7 @@ packages: - lsb-release - make - mawk + - mingw-w64 - nettle-dev - patch - perl diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh index 214574fed08..4c8c65223f9 100755 --- a/bootstrap/generated-dists/debian8/bootstrap.sh +++ b/bootstrap/generated-dists/debian8/bootstrap.sh @@ -72,6 +72,7 @@ apt-get -y install \ lsb-release \ make \ mawk \ + mingw-w64 \ nettle-dev \ patch \ perl \ diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml index f5574edb1b9..a2d4bdb0638 100644 --- a/bootstrap/generated-dists/debian8/packages.yml +++ b/bootstrap/generated-dists/debian8/packages.yml @@ -61,6 +61,7 @@ packages: - lsb-release - make - mawk + - mingw-w64 - nettle-dev - patch - perl diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh index 9349fd2fa5b..fa7051a67e1 100755 --- a/bootstrap/generated-dists/debian9/bootstrap.sh +++ b/bootstrap/generated-dists/debian9/bootstrap.sh @@ -72,6 +72,7 @@ apt-get -y install \ lsb-release \ make \ mawk \ + mingw-w64 \ nettle-dev \ patch \ perl \ diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml index d46d33f1e57..1e3bd0c380c 100644 --- a/bootstrap/generated-dists/debian9/packages.yml +++ b/bootstrap/generated-dists/debian9/packages.yml @@ -61,6 +61,7 @@ packages: - lsb-release - make - mawk + - mingw-w64 - nettle-dev - patch - perl diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh index 85b328cc711..048efa5f3a3 100755 --- a/bootstrap/generated-dists/fedora28/bootstrap.sh +++ b/bootstrap/generated-dists/fedora28/bootstrap.sh @@ -65,6 +65,7 @@ dnf install -y \ lmdb \ lmdb-devel \ make \ + mingw64-gcc \ ncurses-devel \ nettle-devel \ openldap-devel \ diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml index 3655cdbd278..c96df0b96a1 100644 --- a/bootstrap/generated-dists/fedora28/packages.yml +++ b/bootstrap/generated-dists/fedora28/packages.yml @@ -54,6 +54,7 @@ packages: - lmdb - lmdb-devel - make + - mingw64-gcc - ncurses-devel - nettle-devel - openldap-devel diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh index 85b328cc711..048efa5f3a3 100755 --- a/bootstrap/generated-dists/fedora29/bootstrap.sh +++ b/bootstrap/generated-dists/fedora29/bootstrap.sh @@ -65,6 +65,7 @@ dnf install -y \ lmdb \ lmdb-devel \ make \ + mingw64-gcc \ ncurses-devel \ nettle-devel \ openldap-devel \ diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml index 3655cdbd278..c96df0b96a1 100644 --- a/bootstrap/generated-dists/fedora29/packages.yml +++ b/bootstrap/generated-dists/fedora29/packages.yml @@ -54,6 +54,7 @@ packages: - lmdb - lmdb-devel - make + - mingw64-gcc - ncurses-devel - nettle-devel - openldap-devel diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh index ba193207c44..65625604f4b 100755 --- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh @@ -70,6 +70,7 @@ apt-get -y install \ lsb-release \ make \ mawk \ + mingw-w64 \ nettle-dev \ patch \ perl \ diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml index 477fc4fb090..8838828d7b8 100644 --- a/bootstrap/generated-dists/ubuntu1404/packages.yml +++ b/bootstrap/generated-dists/ubuntu1404/packages.yml @@ -59,6 +59,7 @@ packages: - lsb-release - make - mawk + - mingw-w64 - nettle-dev - patch - perl diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh index 6a3e43f3dab..a47ef984cb5 100755 --- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh @@ -71,6 +71,7 @@ apt-get -y install \ lsb-release \ make \ mawk \ + mingw-w64 \ nettle-dev \ patch \ perl \ diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml index 653add38bfb..23939c38e80 100644 --- a/bootstrap/generated-dists/ubuntu1604/packages.yml +++ b/bootstrap/generated-dists/ubuntu1604/packages.yml @@ -60,6 +60,7 @@ packages: - lsb-release - make - mawk + - mingw-w64 - nettle-dev - patch - perl diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh index 6149a2b27ea..45212ccfb81 100755 --- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh @@ -73,6 +73,7 @@ apt-get -y install \ lsb-release \ make \ mawk \ + mingw-w64 \ nettle-dev \ patch \ perl \ diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml index 07e0ab9c217..f2c981fba83 100644 --- a/bootstrap/generated-dists/ubuntu1804/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804/packages.yml @@ -62,6 +62,7 @@ packages: - lsb-release - make - mawk + - mingw-w64 - nettle-dev - patch - perl diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 02229d245ac..7aa5a4a6aea 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -1185fa2a316b3bb7e0c24e9fb8279d4c17450809 +a50a08a6ecfbe1113f3892c0cb3e2646d58a1521 |