From 2ee7717774348de7270a4c04ef1c4b4e26477138 Mon Sep 17 00:00:00 2001 From: Tingluo Huang Date: Fri, 15 Jan 2021 09:14:55 -0500 Subject: [PATCH] Update ldd check with dotnet 5. --- docs/start/envlinux.md | 8 ++++---- src/Misc/layoutbin/installdependencies.sh | 6 +++--- src/Misc/layoutroot/config.sh | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/start/envlinux.md b/docs/start/envlinux.md index 4ae20148d34..8f1856cb654 100644 --- a/docs/start/envlinux.md +++ b/docs/start/envlinux.md @@ -15,16 +15,16 @@ x64 - openSUSE 15+ - SUSE Enterprise Linux (SLES) 12 SP2+ -## Install .Net Core 3.x Linux Dependencies +## Install .Net Core 5 Linux Dependencies -The `./config.sh` will check .Net Core 3.x dependencies during runner configuration. +The `./config.sh` will check .Net Core 5 dependencies during runner configuration. You might see something like this which indicate a dependency's missing. ```bash ./config.sh libunwind.so.8 => not found libunwind-x86_64.so.8 => not found -Dependencies is missing for Dotnet Core 3.0 -Execute ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies. +Dependencies is missing for Dotnet 5 +Execute ./bin/installdependencies.sh to install any missing Dotnet 5 dependencies. ``` You can easily correct the problem by executing `./bin/installdependencies.sh`. The `installdependencies.sh` script should install all required dependencies on all supported Linux versions diff --git a/src/Misc/layoutbin/installdependencies.sh b/src/Misc/layoutbin/installdependencies.sh index d771afcfbf9..d54260f98ee 100755 --- a/src/Misc/layoutbin/installdependencies.sh +++ b/src/Misc/layoutbin/installdependencies.sh @@ -14,14 +14,14 @@ fi function print_errormessage() { - echo "Can't install dotnet core dependencies." + echo "Can't install dotnet 5 dependencies." echo "You can manually install all required dependencies based on following documentation" echo "https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x" } function print_rhel6message() { - echo "We did our best effort to install dotnet core dependencies" + echo "We did our best effort to install dotnet 5 dependencies" echo "However, there are some dependencies which require manual installation" echo "You can install all remaining required dependencies based on the following documentation" echo "https://github.com/dotnet/core/blob/master/Documentation/build-and-install-rhel6-prerequisites.md" @@ -29,7 +29,7 @@ function print_rhel6message() function print_rhel6errormessage() { - echo "We couldn't install dotnet core dependencies" + echo "We couldn't install dotnet 5 dependencies" echo "You can manually install all required dependencies based on following documentation" echo "https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x" echo "In addition, there are some dependencies which require manual installation. Please follow this documentation" diff --git a/src/Misc/layoutroot/config.sh b/src/Misc/layoutroot/config.sh index 3dad7c76f35..63a9d45d000 100755 --- a/src/Misc/layoutroot/config.sh +++ b/src/Misc/layoutroot/config.sh @@ -8,7 +8,7 @@ if [ $user_id -eq 0 -a -z "$RUNNER_ALLOW_RUNASROOT" ]; then exit 1 fi -# Check dotnet core 3.0 dependencies for Linux +# Check dotnet 5 dependencies for Linux if [[ (`uname` == "Linux") ]] then command -v ldd > /dev/null @@ -18,25 +18,25 @@ then exit 1 fi - message="Execute sudo ./bin/installdependencies.sh to install any missing Dotnet Core 3.0 dependencies." + message="Execute sudo ./bin/installdependencies.sh to install any missing Dotnet 5 dependencies." ldd ./bin/libcoreclr.so | grep 'not found' if [ $? -eq 0 ]; then - echo "Dependencies is missing for Dotnet Core 3.0" + echo "Dependencies is missing for Dotnet 5" echo $message exit 1 fi - ldd ./bin/System.Security.Cryptography.Native.OpenSsl.so | grep 'not found' + ldd ./bin/libSystem.Security.Cryptography.Native.OpenSsl.so | grep 'not found' if [ $? -eq 0 ]; then - echo "Dependencies is missing for Dotnet Core 3.0" + echo "Dependencies is missing for Dotnet 5" echo $message exit 1 fi - ldd ./bin/System.IO.Compression.Native.so | grep 'not found' + ldd ./bin/libSystem.IO.Compression.Native.so | grep 'not found' if [ $? -eq 0 ]; then - echo "Dependencies is missing for Dotnet Core 3.0" + echo "Dependencies is missing for Dotnet 5" echo $message exit 1 fi @@ -54,7 +54,7 @@ then libpath=${LD_LIBRARY_PATH:-} $LDCONFIG_COMMAND -NXv ${libpath//:/ } 2>&1 | grep libicu >/dev/null 2>&1 if [ $? -ne 0 ]; then - echo "Libicu's dependencies is missing for Dotnet Core 3.0" + echo "Libicu's dependencies is missing for Dotnet 5" echo $message exit 1 fi