From 89267dbcc8efbc29adcf0215c7573cf03f6fb75d Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 1 Feb 2022 15:59:14 +0000 Subject: [PATCH] ci: install libbsd dependency The libbsd dependency is used to enable support for `setproctitle()` and `strlcpy()`. Signed-off-by: Radostin Stoyanov --- .cirrus.yml | 4 ++-- .lgtm.yml | 1 + scripts/ci/prepare-for-fedora-rawhide.sh | 1 + scripts/ci/vagrant.sh | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index ef0de54e9..588cf3e82 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -36,7 +36,7 @@ task: ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm dnf-plugins-core yum config-manager --set-enabled powertools - yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf xmlto + yum install -y --allowerasing asciidoc gcc git gnutls-devel libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel libselinux-devel make protobuf-c-devel protobuf-devel python3-devel python3-flake8 python3-PyYAML python3-future python3-protobuf xmlto alternatives --set python /usr/bin/python3 systemctl stop sssd # Even with selinux in permissive mode the selinux tests will be executed @@ -64,7 +64,7 @@ task: setup_script: | ln -sf /usr/include/google/protobuf/descriptor.proto images/google/protobuf/descriptor.proto - yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel + yum install -y findutils gcc git gnutls-devel iproute iptables libaio-devel libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make procps-ng protobuf-c-devel protobuf-devel protobuf-python python python-flake8 python-ipaddress python2-future python2-junit_xml python-yaml python-six sudo tar which e2fsprogs python2-pip rubygem-asciidoctor libselinux-devel # Even with selinux in permissive mode the selinux tests will be executed # The Cirrus CI user runs as a service from selinux point of view and is # much more restricted than a normal shell (system_u:system_r:unconfined_service_t:s0) diff --git a/.lgtm.yml b/.lgtm.yml index a28c35de0..a884a53ef 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -19,6 +19,7 @@ extraction: - "iproute2" - "libcap-dev" - "libaio-dev" + - "libbsd-dev" - "python3-yaml" - "libnl-route-3-dev" - "python-future" diff --git a/scripts/ci/prepare-for-fedora-rawhide.sh b/scripts/ci/prepare-for-fedora-rawhide.sh index e5900e563..f4d3155f9 100755 --- a/scripts/ci/prepare-for-fedora-rawhide.sh +++ b/scripts/ci/prepare-for-fedora-rawhide.sh @@ -17,6 +17,7 @@ dnf install -y \ libcap-devel \ libnet-devel \ libnl3-devel \ + libbsd-devel \ make \ procps-ng \ protobuf-c-devel \ diff --git a/scripts/ci/vagrant.sh b/scripts/ci/vagrant.sh index 4a4a16445..0440193bc 100755 --- a/scripts/ci/vagrant.sh +++ b/scripts/ci/vagrant.sh @@ -37,7 +37,7 @@ setup() { vagrant ssh-config >> /root/.ssh/config ssh default sudo dnf upgrade -y ssh default sudo dnf install -y gcc git gnutls-devel nftables-devel libaio-devel \ - libasan libcap-devel libnet-devel libnl3-devel make protobuf-c-devel \ + libasan libcap-devel libnet-devel libnl3-devel libbsd-devel make protobuf-c-devel \ protobuf-devel python3-flake8 python3-future python3-protobuf \ python3-junit_xml rubygem-asciidoctor iptables libselinux-devel libbpf-devel # Disable sssd to avoid zdtm test failures in pty04 due to sssd socket