bootstrap: add mingw packages

This makes sure we at least compile the example/winexe code

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbf329178b424538673ac2b86684f1cc0e27a3ae..dfa1f6423d3383a4d4fcf6982293244690008917 100644 (file)
--- 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 bd651e28597956059d5a3a468ed5544fd5efca2f..279d1f0a0461c000a5d09f66540cdc467b6e1e70 100644 (file)
--- 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 1279bbce7b961e9c8d243dc160753f5578bd8690..6d60bd2cdc9afb3ea3c9b9cae59108d8ba59672f 100755 (executable)
--- 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 cb60034d299e812ad56ed753d68196aa36ce0bee..168fbe9d334c5cae52889c810d9f9e907903c216 100644 (file)
--- 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 81786a80bead7c5ac9059988dbea5dead44134e1..b59ef6a5dcf2ac986db65d80f57bd338038c46e2 100755 (executable)
--- 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 7f10cd38f1c8a34d5815d85bd75fb188f9a7eb70..7a106d8dfd591d22ce714199ff6e9f154bacf680 100644 (file)
--- 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 f506af4c616041d5b1cd0c0e0dd742e8c2409b26..4e126cf5e8ed761682e7e39b0b1214a9e0c61a0d 100755 (executable)
--- 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 645df5a06920f5db9f6740fe0765d0b7c61acf4b..667825c283e1cf60a43f03d2ccb57790a3b24209 100644 (file)
--- 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 214574fed08abd678152d473a650ddb1de0dbac0..4c8c65223f979f3bcbc978b6b5e09120a6302e66 100755 (executable)
--- 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 f5574edb1b99c8b69d62df9acac928e21108d8af..a2d4bdb0638acf6c03369b35acccd9115222b58d 100644 (file)
--- 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 9349fd2fa5b21029d20df042a62774aeaa50be91..fa7051a67e189a39a20b9b5fb4fad2c2fc0c97f3 100755 (executable)
--- 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 d46d33f1e572baf30698eb4fb51fa9f06a5c5de8..1e3bd0c380c64f1e9db800df17864e3f6b1185ff 100644 (file)
--- 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 85b328cc7112ad2f3bafcbcaa01f631039347c75..048efa5f3a336e663e8e9727084c6439e04dd583 100755 (executable)
--- 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 3655cdbd27849087b2dbc56116a7daf5899f9144..c96df0b96a136eecfd74a4ecea7ea59ba2f0ea07 100644 (file)
--- 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 85b328cc7112ad2f3bafcbcaa01f631039347c75..048efa5f3a336e663e8e9727084c6439e04dd583 100755 (executable)
--- 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 3655cdbd27849087b2dbc56116a7daf5899f9144..c96df0b96a136eecfd74a4ecea7ea59ba2f0ea07 100644 (file)
--- 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 ba193207c441f5a445a5f2f6e8015d0c704cd2d7..65625604f4bb592973e7f0e9744bbde8e08d8b1e 100755 (executable)
--- 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 477fc4fb090671f071431a576f2ff3e2b168a3dd..8838828d7b8b19fce6f19f7f25e357b09f84f948 100644 (file)
--- 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 6a3e43f3dab944819b6b087a48275577d855d36c..a47ef984cb542fd8075311b1c24168a15fc540d3 100755 (executable)
--- 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 653add38bfb498bc60fc765cb1502edda49204a9..23939c38e80fd73bb48013b1b970744f0b01c350 100644 (file)
--- 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 6149a2b27eac717070ace876a77a43db59619df8..45212ccfb8143442329e6fe3dbbafd328e6d8ccc 100755 (executable)
--- 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 07e0ab9c217bd919fca54773f843529e09169035..f2c981fba83d92a6aec31966ce97016d100d6abc 100644 (file)
--- 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 02229d245ac21f8c7ba60d71f3d8adca53d17d8b..7aa5a4a6aea2bd1675b1ad1fba99a4a939ca306a 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-1185fa2a316b3bb7e0c24e9fb8279d4c17450809
+a50a08a6ecfbe1113f3892c0cb3e2646d58a1521