From: Ralph Boehme <slow@samba.org>
Date: Fri, 19 Apr 2019 09:04:58 +0000 (+0200)
Subject: bootstrap: move flex to common packages
X-Git-Tag: tdb-1.4.1~319
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5166089d6960379872d864e74eb4e1cf177cdd1;p=thirdparty%2Fsamba.git

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 9d596372df8..e43000548ca 100644
--- 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 8d85dce1e83..d8bb7cf9654 100644
--- 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 2ac905ddda7..be21d8bec69 100755
--- 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 344d88a5d2a..c7953bd60f9 100644
--- 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 90dcbd19566..08a11b7ee93 100755
--- 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 d5048a71d77..c3bbe7ba4a6 100644
--- 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 ec1fdff902a..6793a37b8c9 100755
--- 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 40cc9e74abb..a37f78b33d2 100644
--- 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 ec1fdff902a..6793a37b8c9 100755
--- 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 40cc9e74abb..a37f78b33d2 100644
--- 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 06f3ca67fed..dbf7dabf55a 100755
--- 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 415384721c3..a6c989ffebd 100644
--- 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 dad5a55516e..d7dbdaee084 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-8606e89b0ce6a916fa881549a6cebf6eed528157
+5c2b831fb6aef8abd25dbdc6ade53ba2ebad1a1c