From 022ecaa7f1c070e83a7be0cf39fc63fd88e1297b Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 20 May 2021 20:20:38 +0200 Subject: [PATCH] vm_setup: Don't fail on freebsd if etc_os-release package is missing This package is not available under latest 13.0 release, however, the /etc/os-release we are looking for is already installed there. For older versions, and in case this package is missing, we still can determine that we are running under freebsd as part of the fallback check to uname(). Signed-off-by: Michal Berger Change-Id: I6a04eb66392d91899a4b55d4eb508bef140e924a Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7985 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/pkg | 1 - test/common/config/vm_setup.sh | 6 ------ 2 files changed, 7 deletions(-) diff --git a/test/common/config/pkgdep/pkg b/test/common/config/pkgdep/pkg index 170c7aaf6..3f3f41725 100644 --- a/test/common/config/pkgdep/pkg +++ b/test/common/config/pkgdep/pkg @@ -11,7 +11,6 @@ install() { } packages=( - etc_os-release pciutils jq gdb diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 6ee58e788..59dbff6a7 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -57,12 +57,6 @@ function error() { } function set_os_id_version() { - if [[ $(uname -s) == FreeBSD ]] && ! pkg info -q etc_os-release; then - echo "Please install 'etc_os-release' package" >&2 - echo "pkg install -y etc_os-release" >&2 - exit 2 - fi - if [[ -f /etc/os-release ]]; then source /etc/os-release elif [[ -f /usr/local/etc/os-release ]]; then