From dfb7cb08cfe616f29d673d7ed01b827e42323193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Mon, 23 Aug 2021 13:58:05 +0200
Subject: [PATCH] Chore(singularity): Install all system dependencies at one
place
Change-Id: I19802a1e4b9f0460f19c6019d111f8905b9d71f1
---
.ci/install_singularity_as_root.sh | 3 ---
.ci/install_system_dependencies.sh | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.ci/install_singularity_as_root.sh b/.ci/install_singularity_as_root.sh
index e02844fc..26081710 100755
--- a/.ci/install_singularity_as_root.sh
+++ b/.ci/install_singularity_as_root.sh
@@ -32,9 +32,6 @@ add_cleanup_step rm_tmp_modules
source "${TMP_MODULES}"
# --------- 8< ---------- 8< -------- 8< ---------
-# don't use spack, build against debian
-apt-get install -y libssl-dev uuid-dev
-
if [ ! -d "${GO_INSTALL_PATH}" ]; then
mkdir -p "${GO_INSTALL_PATH}"
fi
diff --git a/.ci/install_system_dependencies.sh b/.ci/install_system_dependencies.sh
index a8c4b1f1..28e0a0e7 100755
--- a/.ci/install_system_dependencies.sh
+++ b/.ci/install_system_dependencies.sh
@@ -35,6 +35,7 @@ system_dependencies=(
"libusb-1.0-0-dev"
"libusb-dev"
"linux-perf-4.19"
+ "libssl-dev"
"lshw"
"man-db"
"ncurses-term"
@@ -46,6 +47,7 @@ system_dependencies=(
"tshark"
"tsocks"
"usbutils"
+ "uuid-dev"
"vim-nox"
"xauth"
"xz-utils"
--
GitLab