From 9ffac29435f7fa07a4417df66eec905c7f9ea49c Mon Sep 17 00:00:00 2001 From: David Mulder Date: Thu, 8 Aug 2024 10:54:23 -0600 Subject: [PATCH] Add clang and openssl deps Ensure CI images are generated with the necessary clang and openssl packages for building. Signed-off-by: David Mulder Reviewed-by: Alexander Bokovoy --- .gitlab-ci-main.yml | 2 +- bootstrap/config.py | 2 ++ bootstrap/generated-dists/centos9s/bootstrap.sh | 2 ++ bootstrap/generated-dists/centos9s/packages.yml | 2 ++ bootstrap/generated-dists/debian11-32bit/bootstrap.sh | 2 ++ bootstrap/generated-dists/debian11-32bit/packages.yml | 2 ++ bootstrap/generated-dists/debian11/bootstrap.sh | 2 ++ bootstrap/generated-dists/debian11/packages.yml | 2 ++ bootstrap/generated-dists/debian12-32bit/bootstrap.sh | 2 ++ bootstrap/generated-dists/debian12-32bit/packages.yml | 2 ++ bootstrap/generated-dists/debian12/bootstrap.sh | 2 ++ bootstrap/generated-dists/debian12/packages.yml | 2 ++ bootstrap/generated-dists/fedora40/bootstrap.sh | 2 ++ bootstrap/generated-dists/fedora40/packages.yml | 2 ++ bootstrap/generated-dists/opensuse155/bootstrap.sh | 2 ++ bootstrap/generated-dists/opensuse155/packages.yml | 2 ++ bootstrap/generated-dists/rocky8/bootstrap.sh | 2 ++ bootstrap/generated-dists/rocky8/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh | 2 ++ bootstrap/generated-dists/ubuntu1804-32bit/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 ++ bootstrap/generated-dists/ubuntu1804/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 2 ++ bootstrap/generated-dists/ubuntu2004/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 2 ++ bootstrap/generated-dists/ubuntu2204/packages.yml | 2 ++ bootstrap/sha1sum.txt | 2 +- 27 files changed, 52 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 263d160a08d..b6caae6ae60 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -47,7 +47,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 2a20df752f162f9d1f617af785e463fa39944c6e + SAMBA_CI_CONTAINER_TAG: edd9967901b27be5820a342e98b483dfde156c43 # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 diff --git a/bootstrap/config.py b/bootstrap/config.py index d862ef407d2..b37ca5ee43a 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -85,6 +85,8 @@ PKGS = [ ('libacl1-dev', 'libacl-devel'), ('libattr1-dev', 'libattr-devel'), ('libutf8proc-dev', 'utf8proc-devel'), + ('libssl-dev', 'openssl-devel'), + ('libclang-dev', 'clang-devel'), # libNAME1-dev, NAME2-devel ('libpopt-dev', 'popt-devel'), diff --git a/bootstrap/generated-dists/centos9s/bootstrap.sh b/bootstrap/generated-dists/centos9s/bootstrap.sh index 926a76f5d50..e3ad1344985 100755 --- a/bootstrap/generated-dists/centos9s/bootstrap.sh +++ b/bootstrap/generated-dists/centos9s/bootstrap.sh @@ -30,6 +30,7 @@ dnf install -y \ cargo \ ccache \ chrpath \ + clang-devel \ crypto-policies-scripts \ cups-devel \ dbus-devel \ @@ -79,6 +80,7 @@ dnf install -y \ mingw64-gcc \ ncurses-devel \ openldap-devel \ + openssl-devel \ pam-devel \ patch \ perl \ diff --git a/bootstrap/generated-dists/centos9s/packages.yml b/bootstrap/generated-dists/centos9s/packages.yml index c218584e723..4a4f99b8564 100644 --- a/bootstrap/generated-dists/centos9s/packages.yml +++ b/bootstrap/generated-dists/centos9s/packages.yml @@ -11,6 +11,7 @@ packages: - cargo - ccache - chrpath + - clang-devel - crypto-policies-scripts - cups-devel - dbus-devel @@ -60,6 +61,7 @@ packages: - mingw64-gcc - ncurses-devel - openldap-devel + - openssl-devel - pam-devel - patch - perl diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh index 4a4ee8cd706..fa731aac174 100755 --- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh +++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh @@ -51,6 +51,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -69,6 +70,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml index ef6b863e35e..63d5f41e064 100644 --- a/bootstrap/generated-dists/debian11-32bit/packages.yml +++ b/bootstrap/generated-dists/debian11-32bit/packages.yml @@ -40,6 +40,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -58,6 +59,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh index 4a4ee8cd706..fa731aac174 100755 --- a/bootstrap/generated-dists/debian11/bootstrap.sh +++ b/bootstrap/generated-dists/debian11/bootstrap.sh @@ -51,6 +51,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -69,6 +70,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml index ef6b863e35e..63d5f41e064 100644 --- a/bootstrap/generated-dists/debian11/packages.yml +++ b/bootstrap/generated-dists/debian11/packages.yml @@ -40,6 +40,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -58,6 +59,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh index 38b3c4777af..eea84b95ba6 100755 --- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh +++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh @@ -51,6 +51,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -69,6 +70,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml index bbc9d814fc7..6191eb9c2aa 100644 --- a/bootstrap/generated-dists/debian12-32bit/packages.yml +++ b/bootstrap/generated-dists/debian12-32bit/packages.yml @@ -40,6 +40,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -58,6 +59,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh index 38b3c4777af..eea84b95ba6 100755 --- a/bootstrap/generated-dists/debian12/bootstrap.sh +++ b/bootstrap/generated-dists/debian12/bootstrap.sh @@ -51,6 +51,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -69,6 +70,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml index bbc9d814fc7..6191eb9c2aa 100644 --- a/bootstrap/generated-dists/debian12/packages.yml +++ b/bootstrap/generated-dists/debian12/packages.yml @@ -40,6 +40,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -58,6 +59,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/fedora40/bootstrap.sh b/bootstrap/generated-dists/fedora40/bootstrap.sh index d794591986b..22d2fa89745 100755 --- a/bootstrap/generated-dists/fedora40/bootstrap.sh +++ b/bootstrap/generated-dists/fedora40/bootstrap.sh @@ -23,6 +23,7 @@ dnf install -y \ cargo \ ccache \ chrpath \ + clang-devel \ codespell \ crypto-policies-scripts \ cups-devel \ @@ -76,6 +77,7 @@ dnf install -y \ mold \ ncurses-devel \ openldap-devel \ + openssl-devel \ pam-devel \ patch \ perl \ diff --git a/bootstrap/generated-dists/fedora40/packages.yml b/bootstrap/generated-dists/fedora40/packages.yml index 2596611c5f3..532ac877fdd 100644 --- a/bootstrap/generated-dists/fedora40/packages.yml +++ b/bootstrap/generated-dists/fedora40/packages.yml @@ -12,6 +12,7 @@ packages: - cargo - ccache - chrpath + - clang-devel - codespell - crypto-policies-scripts - cups-devel @@ -65,6 +66,7 @@ packages: - mold - ncurses-devel - openldap-devel + - openssl-devel - pam-devel - patch - perl diff --git a/bootstrap/generated-dists/opensuse155/bootstrap.sh b/bootstrap/generated-dists/opensuse155/bootstrap.sh index adfa8615500..e81cc18ccfb 100755 --- a/bootstrap/generated-dists/opensuse155/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse155/bootstrap.sh @@ -23,6 +23,7 @@ zypper --non-interactive install \ cargo \ ccache \ chrpath \ + clang-devel \ codespell \ crypto-policies-scripts \ cups-devel \ @@ -73,6 +74,7 @@ zypper --non-interactive install \ mingw64-gcc \ ncurses-devel \ openldap2-devel \ + openssl-devel \ pam-devel \ patch \ perl \ diff --git a/bootstrap/generated-dists/opensuse155/packages.yml b/bootstrap/generated-dists/opensuse155/packages.yml index 05ebdf739d8..b709cc45e23 100644 --- a/bootstrap/generated-dists/opensuse155/packages.yml +++ b/bootstrap/generated-dists/opensuse155/packages.yml @@ -11,6 +11,7 @@ packages: - cargo - ccache - chrpath + - clang-devel - codespell - crypto-policies-scripts - cups-devel @@ -61,6 +62,7 @@ packages: - mingw64-gcc - ncurses-devel - openldap2-devel + - openssl-devel - pam-devel - patch - perl diff --git a/bootstrap/generated-dists/rocky8/bootstrap.sh b/bootstrap/generated-dists/rocky8/bootstrap.sh index 39dca159979..ae45151eab2 100755 --- a/bootstrap/generated-dists/rocky8/bootstrap.sh +++ b/bootstrap/generated-dists/rocky8/bootstrap.sh @@ -29,6 +29,7 @@ yum install -y \ cargo \ ccache \ chrpath \ + clang-devel \ crypto-policies-scripts \ cups-devel \ curl \ @@ -78,6 +79,7 @@ yum install -y \ mingw64-gcc \ ncurses-devel \ openldap-devel \ + openssl-devel \ pam-devel \ patch \ perl \ diff --git a/bootstrap/generated-dists/rocky8/packages.yml b/bootstrap/generated-dists/rocky8/packages.yml index 4be31034442..cd91a67f11a 100644 --- a/bootstrap/generated-dists/rocky8/packages.yml +++ b/bootstrap/generated-dists/rocky8/packages.yml @@ -11,6 +11,7 @@ packages: - cargo - ccache - chrpath + - clang-devel - crypto-policies-scripts - cups-devel - curl @@ -60,6 +61,7 @@ packages: - mingw64-gcc - ncurses-devel - openldap-devel + - openssl-devel - pam-devel - patch - perl diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh index 607da6b4eae..2cb5e686209 100755 --- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh @@ -52,6 +52,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -70,6 +71,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml index 80dd35cc204..857ab0f6cfa 100644 --- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml @@ -41,6 +41,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -59,6 +60,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh index 607da6b4eae..2cb5e686209 100755 --- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh @@ -52,6 +52,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -70,6 +71,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml index 80dd35cc204..857ab0f6cfa 100644 --- a/bootstrap/generated-dists/ubuntu1804/packages.yml +++ b/bootstrap/generated-dists/ubuntu1804/packages.yml @@ -41,6 +41,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -59,6 +60,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh index 607da6b4eae..2cb5e686209 100755 --- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh @@ -52,6 +52,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -70,6 +71,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml index 80dd35cc204..857ab0f6cfa 100644 --- a/bootstrap/generated-dists/ubuntu2004/packages.yml +++ b/bootstrap/generated-dists/ubuntu2004/packages.yml @@ -41,6 +41,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -59,6 +60,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh index fab68e8d7b6..b1039708194 100755 --- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh +++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh @@ -52,6 +52,7 @@ apt-get -y install \ libbsd-dev \ libcap-dev \ libcephfs-dev \ + libclang-dev \ libcups2-dev \ libdbus-1-dev \ libglib2.0-dev \ @@ -70,6 +71,7 @@ apt-get -y install \ libpcap-dev \ libpopt-dev \ libreadline-dev \ + libssl-dev \ libsystemd-dev \ libtasn1-bin \ libtasn1-dev \ diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml index bd8052bbf44..8ab93b80b2d 100644 --- a/bootstrap/generated-dists/ubuntu2204/packages.yml +++ b/bootstrap/generated-dists/ubuntu2204/packages.yml @@ -41,6 +41,7 @@ packages: - libbsd-dev - libcap-dev - libcephfs-dev + - libclang-dev - libcups2-dev - libdbus-1-dev - libglib2.0-dev @@ -59,6 +60,7 @@ packages: - libpcap-dev - libpopt-dev - libreadline-dev + - libssl-dev - libsystemd-dev - libtasn1-bin - libtasn1-dev diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index cc706332405..eaa3163d89d 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -2a20df752f162f9d1f617af785e463fa39944c6e +edd9967901b27be5820a342e98b483dfde156c43 -- 2.47.3