Merge pull request #5046 from fidencio/topic/fix-regression-on-building-tdx-kernel

kernel: Re-work get_tee_kernel()
This commit is contained in:
Fabiano Fidêncio 2022-08-31 13:16:26 +02:00 committed by GitHub
commit 08d230c940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View File

@ -128,13 +128,12 @@ get_tee_kernel() {
[ -z "${kernel_url}" ] && kernel_url=$(get_from_kata_deps "assets.kernel.${tee}.url")
kernel_tarball="linux-${version}.tar.gz"
tarball_name=$(get_from_kata_deps "assets.kernel.${tee}.tarball")
[ -z "$tarball_name" ] || kernel_tarball="$tarball_name"
local kernel_tarball="${version}.tar.gz"
if [ ! -f "${kernel_tarball}" ]; then
curl --fail -OL "${kernel_url}/${kernel_tarball}"
fi
# Depending on where we're getting the terball from it may have a
# different name, such as linux-${version}.tar.gz or simply
# ${version}.tar.gz. Let's try both before failing.
curl --fail -OL "${kernel_url}/linux-${kernel_tarball}" || curl --fail -OL "${kernel_url}/${kernel_tarball}"
mkdir -p ${kernel_path}
tar --strip-components=1 -xf ${kernel_tarball} -C ${kernel_path}

View File

@ -158,7 +158,6 @@ assets:
description: "Linux kernel that supports TDX"
url: "https://github.com/intel/linux-kernel-dcp/archive/refs/tags"
tag: "SPR-BKC-PC-v9.6"
tarball: "SPR-BKC-PC-v9.6.tar.gz"
sev:
description: "Linux kernel that supports SEV"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"