From ca2b1bc6d5eb87339966571a8ad453adcdca4cf2 Mon Sep 17 00:00:00 2001 From: Tuukka Lahti <44365408+tuukkalahti@users.noreply.github.com> Date: Wed, 15 Jun 2022 19:37:02 +0300 Subject: [PATCH] Update dependencies list to support Ubuntu 22.04 (#1946) --- docs/start/envlinux.md | 2 +- src/Misc/layoutbin/installdependencies.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/start/envlinux.md b/docs/start/envlinux.md index 6db503e69..5fddae96f 100644 --- a/docs/start/envlinux.md +++ b/docs/start/envlinux.md @@ -34,7 +34,7 @@ The `installdependencies.sh` script should install all required dependencies on Debian based OS (Debian, Ubuntu, Linux Mint) -- liblttng-ust0 +- liblttng-ust1 or liblttng-ust0 - libkrb5-3 - zlib1g - libssl1.1, libssl1.0.2 or libssl1.0.0 diff --git a/src/Misc/layoutbin/installdependencies.sh b/src/Misc/layoutbin/installdependencies.sh index c6b0aaa73..552f30ce2 100755 --- a/src/Misc/layoutbin/installdependencies.sh +++ b/src/Misc/layoutbin/installdependencies.sh @@ -66,7 +66,7 @@ then fi fi - $apt_get update && $apt_get install -y liblttng-ust0 libkrb5-3 zlib1g + $apt_get update && $apt_get install -y libkrb5-3 zlib1g if [ $? -ne 0 ] then echo "'$apt_get' failed with exit code '$?'" @@ -94,6 +94,14 @@ then fi } + apt_get_with_fallbacks liblttng-ust1 liblttng-ust0 + if [ $? -ne 0 ] + then + echo "'$apt_get' failed with exit code '$?'" + print_errormessage + exit 1 + fi + apt_get_with_fallbacks libssl1.1$ libssl1.0.2$ libssl1.0.0$ if [ $? -ne 0 ] then