2025-01-10 01:18:15 +03:00 · 2021-05-06 15:36:20 +02:00 · 2021-05-06 15:36:20 +02:00 · 7555665664
commit 7555665664
parent 8f12793ca5
15 changed files with 2 additions and 17 deletions
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@ -42,7 +42,7 @@ variables:
  # Set this to the contents of bootstrap/sha1sum.txt
  # which is generated by bootstrap/template.py --render
  #
-  SAMBA_CI_CONTAINER_TAG: f25e1fa0a828f428ade0e4f37d8a646ff1e207d4
+  SAMBA_CI_CONTAINER_TAG: d6f5c29855b1bf8173d2e75668487c49c7ee75ac
  #
  # We use the ubuntu1804 image as default as
  # it matches what we have on sn-devel-184.
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@ -126,7 +126,6 @@ PKGS = [
    ('', 'rpcgen'),  # required for test
    # refer: https://fedoraproject.org/wiki/Changes/SunRPCRemoval
    ('', 'libtirpc-devel'),  # for <rpc/rpc.h> header on fedora
-    ('', 'libnsl2-devel'),  # for <rpcsvc/yp_prot.h> header on fedora
    ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
    ('mawk', 'gawk'),

@ -508,7 +507,6 @@ RPM_DISTS = {
            'jansson-devel': 'libjansson-devel',
            'keyutils-libs-devel': 'keyutils-devel',
            'krb5-workstation': 'krb5-client',
-            'libnsl2-devel': 'libnsl-devel',
            'libsemanage-python': 'python2-semanage',
            'openldap-devel': 'openldap2-devel',
            'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
@ -540,7 +538,6 @@ RPM_DISTS = {
            'jansson-devel': 'libjansson-devel',
            'keyutils-libs-devel': 'keyutils-devel',
            'krb5-workstation': 'krb5-client',
-            'libnsl2-devel': 'libnsl-devel',
            'libsemanage-python': 'python2-semanage',
            'openldap-devel': 'openldap2-devel',
            'perl-Archive-Tar': 'perl-Archive-Tar-Wrapper',
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@ -53,7 +53,6 @@ yum install -y \
    libbsd-devel \
    libcap-devel \
    libicu-devel \
-    libnsl2-devel \
    libpcap-devel \
    libsemanage-python \
    libtasn1-devel \
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@ -39,7 +39,6 @@ packages:
  - libbsd-devel
  - libcap-devel
  - libicu-devel
-  - libnsl2-devel
  - libpcap-devel
  - libsemanage-python
  - libtasn1-devel
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@ -62,7 +62,6 @@ yum install -y \
    libcap-devel \
    libcephfs-devel \
    libicu-devel \
-    libnsl2-devel \
    libpcap-devel \
    libtasn1-devel \
    libtasn1-tools \
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@ -42,7 +42,6 @@ packages:
  - libcap-devel
  - libcephfs-devel
  - libicu-devel
-  - libnsl2-devel
  - libpcap-devel
  - libtasn1-devel
  - libtasn1-tools
--- a/bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@ -54,7 +54,6 @@ dnf install -y \
    libcap-devel \
    libcephfs-devel \
    libicu-devel \
-    libnsl2-devel \
    libpcap-devel \
    libtasn1-devel \
    libtasn1-tools \
--- a/bootstrap/generated-dists/fedora32/packages.yml
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@ -43,7 +43,6 @@ packages:
  - libcap-devel
  - libcephfs-devel
  - libicu-devel
-  - libnsl2-devel
  - libpcap-devel
  - libtasn1-devel
  - libtasn1-tools
--- a/bootstrap/generated-dists/fedora33/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora33/bootstrap.sh
@ -54,7 +54,6 @@ dnf install -y \
    libcap-devel \
    libcephfs-devel \
    libicu-devel \
-    libnsl2-devel \
    libpcap-devel \
    libtasn1-devel \
    libtasn1-tools \
--- a/bootstrap/generated-dists/fedora33/packages.yml
+++ b/bootstrap/generated-dists/fedora33/packages.yml
@ -43,7 +43,6 @@ packages:
  - libcap-devel
  - libcephfs-devel
  - libicu-devel
-  - libnsl2-devel
  - libpcap-devel
  - libtasn1-devel
  - libtasn1-tools
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@ -52,7 +52,6 @@ zypper --non-interactive install \
    libcephfs-devel \
    libicu-devel \
    libjansson-devel \
-    libnsl-devel \
    libpcap-devel \
    libtasn1-devel \
    libtirpc-devel \
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@ -40,7 +40,6 @@ packages:
  - libcephfs-devel
  - libicu-devel
  - libjansson-devel
-  - libnsl-devel
  - libpcap-devel
  - libtasn1-devel
  - libtirpc-devel
--- a/bootstrap/generated-dists/opensuse152/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse152/bootstrap.sh
@ -52,7 +52,6 @@ zypper --non-interactive install \
    libcephfs-devel \
    libicu-devel \
    libjansson-devel \
-    libnsl-devel \
    libpcap-devel \
    libtasn1-devel \
    libtirpc-devel \
--- a/bootstrap/generated-dists/opensuse152/packages.yml
+++ b/bootstrap/generated-dists/opensuse152/packages.yml
@ -40,7 +40,6 @@ packages:
  - libcephfs-devel
  - libicu-devel
  - libjansson-devel
-  - libnsl-devel
  - libpcap-devel
  - libtasn1-devel
  - libtirpc-devel
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@ -1 +1 @@
-f25e1fa0a828f428ade0e4f37d8a646ff1e207d4
+d6f5c29855b1bf8173d2e75668487c49c7ee75ac