summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2019-05-09 18:21:24 +0200
committerAndrew Bartlett <abartlet@samba.org>2019-05-10 01:15:16 +0000
commit2f0c49e654a857cc43ba3b1e4b47a95078e01750 (patch)
tree36994d028fd0a56b6f98a22e89e1e0ef223424f3 /bootstrap
parent667db8e8c7836c750085729f5062807669cbb204 (diff)
downloadsamba-2f0c49e654a857cc43ba3b1e4b47a95078e01750.tar.gz
gitlab-ci: Install libtasn1-tools on Fedora based distributions
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/config.py3
-rwxr-xr-xbootstrap/generated-dists/centos6/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/centos6/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/centos7/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/centos7/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/fedora28/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/fedora28/packages.yml1
-rwxr-xr-xbootstrap/generated-dists/fedora29/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/fedora29/packages.yml1
-rw-r--r--bootstrap/sha1sum.txt2
10 files changed, 11 insertions, 2 deletions
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 6d3fb2e5c9c..bd651e28597 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -90,7 +90,7 @@ PKGS = [
('libgpgme11-dev', 'gpgme-devel'),
# NOTE: Debian 8+ and Ubuntu 14.04+
('libgnutls28-dev', 'gnutls-devel'),
- ('libtasn1-bin', ''),
+ ('libtasn1-bin', 'libtasn1-tools'),
('libtasn1-dev', 'libtasn1-devel'),
('', 'quota-devel'),
('uuid-dev', 'libuuid-devel'),
@@ -524,6 +524,7 @@ RPM_DISTS = {
'python3-markdown': 'python3-Markdown',
'quota-devel': '',
'glusterfs-api-devel': '',
+ 'libtasn1-tools': '', # asn1Parser is part of libtasn1
}
}
}
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index 203386bf447..1279bbce7b9 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -54,6 +54,7 @@ yum install -y \
libpcap-devel \
libsemanage-python \
libtasn1-devel \
+ libtasn1-tools \
libtirpc-devel \
libunwind-devel \
libuuid-devel \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index 98a89a844f9..cb60034d299 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -42,6 +42,7 @@ packages:
- libpcap-devel
- libsemanage-python
- libtasn1-devel
+ - libtasn1-tools
- libtirpc-devel
- libunwind-devel
- libuuid-devel
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index c3ccc4bb0b9..81786a80bea 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -54,6 +54,7 @@ yum install -y \
libpcap-devel \
libsemanage-python \
libtasn1-devel \
+ libtasn1-tools \
libtirpc-devel \
libunwind-devel \
libuuid-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 40c5513d72c..7f10cd38f1c 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -42,6 +42,7 @@ packages:
- libpcap-devel
- libsemanage-python
- libtasn1-devel
+ - libtasn1-tools
- libtirpc-devel
- libunwind-devel
- libuuid-devel
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index 2c365247e6a..85b328cc711 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -57,6 +57,7 @@ dnf install -y \
libpcap-devel \
libsemanage-python \
libtasn1-devel \
+ libtasn1-tools \
libtirpc-devel \
libunwind-devel \
libuuid-devel \
diff --git a/bootstrap/generated-dists/fedora28/packages.yml b/bootstrap/generated-dists/fedora28/packages.yml
index 2961e4c0a50..3655cdbd278 100644
--- a/bootstrap/generated-dists/fedora28/packages.yml
+++ b/bootstrap/generated-dists/fedora28/packages.yml
@@ -46,6 +46,7 @@ packages:
- libpcap-devel
- libsemanage-python
- libtasn1-devel
+ - libtasn1-tools
- libtirpc-devel
- libunwind-devel
- libuuid-devel
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index 2c365247e6a..85b328cc711 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -57,6 +57,7 @@ dnf install -y \
libpcap-devel \
libsemanage-python \
libtasn1-devel \
+ libtasn1-tools \
libtirpc-devel \
libunwind-devel \
libuuid-devel \
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 2961e4c0a50..3655cdbd278 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -46,6 +46,7 @@ packages:
- libpcap-devel
- libsemanage-python
- libtasn1-devel
+ - libtasn1-tools
- libtirpc-devel
- libunwind-devel
- libuuid-devel
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a5d74e48a7e..02229d245ac 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-93278680b4e7086c0bec11a58bc3533f9971c08e
+1185fa2a316b3bb7e0c24e9fb8279d4c17450809