ci: install_libseccomp: Do not depend on the tests repo

It makes things way simpler, waaaaay simpler.

Fixes: #7974 -- part 0

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-09-15 16:08:34 +02:00
parent bf888b9a5e
commit 1d32410a83

View File

@ -7,12 +7,10 @@
set -o errexit set -o errexit
cidir=$(dirname "$0") script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${cidir}/lib.sh" script_name="$(basename "${BASH_SOURCE[0]}")"
clone_tests_repo source "${script_dir}/../tests/common.bash"
source "${tests_repo_dir}/.ci/lib.sh"
# The following variables if set on the environment will change the behavior # The following variables if set on the environment will change the behavior
# of gperf and libseccomp configure scripts, that may lead this script to # of gperf and libseccomp configure scripts, that may lead this script to
@ -25,11 +23,11 @@ workdir="$(mktemp -d --tmpdir build-libseccomp.XXXXX)"
# Variables for libseccomp # Variables for libseccomp
libseccomp_version="${LIBSECCOMP_VERSION:-""}" libseccomp_version="${LIBSECCOMP_VERSION:-""}"
if [ -z "${libseccomp_version}" ]; then if [ -z "${libseccomp_version}" ]; then
libseccomp_version=$(get_version "externals.libseccomp.version") libseccomp_version=$(get_from_kata_deps "externals.libseccomp.version")
fi fi
libseccomp_url="${LIBSECCOMP_URL:-""}" libseccomp_url="${LIBSECCOMP_URL:-""}"
if [ -z "${libseccomp_url}" ]; then if [ -z "${libseccomp_url}" ]; then
libseccomp_url=$(get_version "externals.libseccomp.url") libseccomp_url=$(get_from_kata_deps "externals.libseccomp.url")
fi fi
libseccomp_tarball="libseccomp-${libseccomp_version}.tar.gz" libseccomp_tarball="libseccomp-${libseccomp_version}.tar.gz"
libseccomp_tarball_url="${libseccomp_url}/releases/download/v${libseccomp_version}/${libseccomp_tarball}" libseccomp_tarball_url="${libseccomp_url}/releases/download/v${libseccomp_version}/${libseccomp_tarball}"
@ -38,11 +36,11 @@ cflags="-O2"
# Variables for gperf # Variables for gperf
gperf_version="${GPERF_VERSION:-""}" gperf_version="${GPERF_VERSION:-""}"
if [ -z "${gperf_version}" ]; then if [ -z "${gperf_version}" ]; then
gperf_version=$(get_version "externals.gperf.version") gperf_version=$(get_from_kata_deps "externals.gperf.version")
fi fi
gperf_url="${GPERF_URL:-""}" gperf_url="${GPERF_URL:-""}"
if [ -z "${gperf_url}" ]; then if [ -z "${gperf_url}" ]; then
gperf_url=$(get_version "externals.gperf.url") gperf_url=$(get_from_kata_deps "externals.gperf.url")
fi fi
gperf_tarball="gperf-${gperf_version}.tar.gz" gperf_tarball="gperf-${gperf_version}.tar.gz"
gperf_tarball_url="${gperf_url}/${gperf_tarball}" gperf_tarball_url="${gperf_url}/${gperf_tarball}"