From e65f29b4c6e82722bf80be441f74ec41488ba8b0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Dec 2019 19:19:02 +0100
Subject: [PATCH] ci: add dependencies for repart + cryptsetup's pkcs#11
 support

Let's make sure we can test systemd-repart properly

(And while we are at it, also test cryptsetup-pkcs#11)
---
 .lgtm.yml                       | 3 +++
 fuzzbuzz.yaml                   | 1 +
 semaphoreci/semaphore-runner.sh | 2 ++
 travis-ci/managers/debian.sh    | 5 ++++-
 travis-ci/managers/fedora.sh    | 5 ++++-
 travis-ci/managers/fuzzbuzz.sh  | 2 ++
 travis-ci/managers/fuzzit.sh    | 2 ++
 7 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.lgtm.yml b/.lgtm.yml
index 5948d8c2bc0..51ec50e3b1e 100644
--- a/.lgtm.yml
+++ b/.lgtm.yml
@@ -5,6 +5,9 @@ extraction:
         - python3-pip
         - python3-setuptools
         - python3-wheel
+        - libfdisk-dev
+        - libp11-kit-dev
+        - libssl-dev
     after_prepare:
       - pip3 install meson
       - export PATH="$HOME/.local/bin/:$PATH"
diff --git a/fuzzbuzz.yaml b/fuzzbuzz.yaml
index 18c70e35553..6dfdd812372 100644
--- a/fuzzbuzz.yaml
+++ b/fuzzbuzz.yaml
@@ -5,6 +5,7 @@ setup:
 - sudo apt-get update -y
 - sudo apt-get build-dep -y systemd
 - sudo apt-get install -y python3-pip
+- sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
 # FIXME: temporarily pin the meson version as 0.53 doesn't work with older
 # python 3.5
 # # See: https://github.com/mesonbuild/meson/issues/6427
diff --git a/semaphoreci/semaphore-runner.sh b/semaphoreci/semaphore-runner.sh
index 504ada59ee0..a5d8bc26a1a 100755
--- a/semaphoreci/semaphore-runner.sh
+++ b/semaphoreci/semaphore-runner.sh
@@ -35,6 +35,8 @@ while [ -z "\$(ip route list 0/0)" ]; do sleep 1; done
 apt-get -q --allow-releaseinfo-change update
 apt-get -y dist-upgrade
 apt-get install -y eatmydata
+# The following four are needed as long as these deps are not covered by Debian's own packaging
+apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
 apt-get purge --auto-remove -y unattended-upgrades
 systemctl unmask systemd-networkd
 systemctl enable systemd-networkd
diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh
index 6a6923fbc86..dedddab3b5a 100755
--- a/travis-ci/managers/debian.sh
+++ b/travis-ci/managers/debian.sh
@@ -18,7 +18,10 @@ REPO_ROOT="${REPO_ROOT:-$PWD}"
 ADDITIONAL_DEPS=(python3-libevdev
                  python3-pyparsing
                  clang
-                 perl)
+                 perl
+                 libfdisk-dev
+                 libp11-kit-dev
+                 libssl-dev)
 
 function info() {
     echo -e "\033[33;1m$1\033[0m"
diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index e07b4938dfd..dbd484c25cf 100755
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -23,7 +23,10 @@ ADDITIONAL_DEPS=(dnf-plugins-core
                  libubsan
                  clang
                  llvm
-                 perl)
+                 perl
+                 libfdisk-devel
+                 openssl-devel
+                 p11-kit-devel)
 
 function info() {
     echo -e "\033[33;1m$1\033[0m"
diff --git a/travis-ci/managers/fuzzbuzz.sh b/travis-ci/managers/fuzzbuzz.sh
index 1541b466526..21b736cb604 100755
--- a/travis-ci/managers/fuzzbuzz.sh
+++ b/travis-ci/managers/fuzzbuzz.sh
@@ -10,6 +10,8 @@ sudo bash -c "echo 'deb-src http://archive.ubuntu.com/ubuntu/ xenial main restri
 sudo apt-get update -y
 sudo apt-get build-dep systemd -y
 sudo apt-get install -y ninja-build python3-pip python3-setuptools quota
+# The following should be dropped when debian packaging has been updated to include them
+sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
 # FIXME: temporarily pin the meson version as 0.53 doesn't work with older python 3.5
 # See: https://github.com/mesonbuild/meson/issues/6427
 pip3 install meson==0.52.1
diff --git a/travis-ci/managers/fuzzit.sh b/travis-ci/managers/fuzzit.sh
index 376761e20cc..044d126e150 100755
--- a/travis-ci/managers/fuzzit.sh
+++ b/travis-ci/managers/fuzzit.sh
@@ -14,6 +14,8 @@ sudo bash -c "echo 'deb-src http://archive.ubuntu.com/ubuntu/ xenial main restri
 sudo apt-get update -y
 sudo apt-get build-dep systemd -y
 sudo apt-get install -y ninja-build python3-pip python3-setuptools
+# The following should be dropped when debian packaging has been updated to include them
+sudo apt-get install -y libfdisk-dev libp11-kit-dev libssl-dev
 # FIXME: temporarily pin the meson version as 0.53 doesn't work with older python 3.5
 # See: https://github.com/mesonbuild/meson/issues/6427
 pip3 install meson==0.52.1
-- 
2.39.2