bootstrap: move flex to common packages

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d596372df8dccc7b0809ba8d8121a7d902507b8..e43000548cad19bec28c78c547c668162d168e84 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 8606e89b0ce6a916fa881549a6cebf6eed528157
+  SAMBA_CI_CONTAINER_TAG: 5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!

diff --git a/bootstrap/config.py b/bootstrap/config.py
index 8d85dce1e831dc67b84d959cdc6f6f17464effbc..d8bb7cf9654fc7760d388235fac8f6c67b62ea99 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -37,6 +37,7 @@ COMMON = [
     'binutils',
     'bison',
     'curl',
+    'flex',
     'gcc',
     'gdb',
     'git',
@@ -163,7 +164,6 @@ PKGS = [
     # rpm has no pkg for docbook-xml
     ('docbook-xml', 'docbook-dtds'),
     ('docbook-xsl', 'docbook-style-xsl'),
-    ('flex', ''),
     ('', 'keyutils-libs-devel'),
     ('', 'which'),
 ]

diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 2ac905ddda721d1772f42439c7eb52a1881d3b60..be21d8bec6991d4621ce30f43ce00c9619752c62 100755 (executable)
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -25,6 +25,7 @@ yum -y -q --verbose install \
     dbus-devel \
     docbook-dtds \
     docbook-style-xsl \
+    flex \
     gawk \
     gcc \
     gdb \

diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 344d88a5d2a243db1dac73b6421413ad5b31166f..c7953bd60f9d889548674481b941345ed9f4bf47 100644 (file)
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -13,6 +13,7 @@ packages:
   - dbus-devel
   - docbook-dtds
   - docbook-style-xsl
+  - flex
   - gawk
   - gcc
   - gdb

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 90dcbd19566d442a6b56fe3e03199db90aeb47a5..08a11b7ee934ade583774a847892b8c2d3800be1 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -25,6 +25,7 @@ yum -y -q --verbose install \
     dbus-devel \
     docbook-dtds \
     docbook-style-xsl \
+    flex \
     gawk \
     gcc \
     gdb \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index d5048a71d776842c3c906c71f58ddf134771701c..c3bbe7ba4a66fdef881c6c30f1e61c7d4a8272b3 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -13,6 +13,7 @@ packages:
   - dbus-devel
   - docbook-dtds
   - docbook-style-xsl
+  - flex
   - gawk
   - gcc
   - gdb

diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index ec1fdff902a286bd2d8cd0cd469b13289951f7f3..6793a37b8c9daeb931593c16ca530fad11bec99e 100755 (executable)
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -23,6 +23,7 @@ dnf -y -q --verbose install \
     dbus-devel \
     docbook-dtds \
     docbook-style-xsl \
+    flex \
     gawk \
     gcc \
     gdb \

diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index 40cc9e74abb4fab91a455a2a3b79ae09aefef774..a37f78b33d2cc8b6c90f15547b8cd9c50cdd1453 100644 (file)
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -13,6 +13,7 @@ packages:
   - dbus-devel
   - docbook-dtds
   - docbook-style-xsl
+  - flex
   - gawk
   - gcc
   - gdb

diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index ec1fdff902a286bd2d8cd0cd469b13289951f7f3..6793a37b8c9daeb931593c16ca530fad11bec99e 100755 (executable)
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -23,6 +23,7 @@ dnf -y -q --verbose install \
     dbus-devel \
     docbook-dtds \
     docbook-style-xsl \
+    flex \
     gawk \
     gcc \
     gdb \

diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 40cc9e74abb4fab91a455a2a3b79ae09aefef774..a37f78b33d2cc8b6c90f15547b8cd9c50cdd1453 100644 (file)
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -13,6 +13,7 @@ packages:
   - dbus-devel
   - docbook-dtds
   - docbook-style-xsl
+  - flex
   - gawk
   - gcc
   - gdb

diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 06f3ca67fede92059b638bf2a10dd4bf35f25a07..dbf7dabf55a248bd25f1e7373fc1b8660289fcc7 100755 (executable)
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -22,6 +22,7 @@ zypper --non-interactive install \
     dbus-1-devel \
     docbook-dtds \
     docbook-xsl-stylesheets \
+    flex \
     gawk \
     gcc \
     gdb \

diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 415384721c3565ca2791d1bef83e0b0157244862..a6c989ffebd573fb12ff6ff293045068d6a39107 100644 (file)
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -12,6 +12,7 @@ packages:
   - dbus-1-devel
   - docbook-dtds
   - docbook-xsl-stylesheets
+  - flex
   - gawk
   - gcc
   - gdb

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index dad5a55516e7773626b3718144793ebf8246b7eb..d7dbdaee0847bb4ab4ffccac96f86ed9d1b1d769 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-8606e89b0ce6a916fa881549a6cebf6eed528157
+5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c