mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-13 15:14:08 +00:00
Merge pull request #5046 from fidencio/topic/fix-regression-on-building-tdx-kernel
kernel: Re-work get_tee_kernel()
This commit is contained in:
commit
08d230c940
@ -128,13 +128,12 @@ get_tee_kernel() {
|
|||||||
|
|
||||||
[ -z "${kernel_url}" ] && kernel_url=$(get_from_kata_deps "assets.kernel.${tee}.url")
|
[ -z "${kernel_url}" ] && kernel_url=$(get_from_kata_deps "assets.kernel.${tee}.url")
|
||||||
|
|
||||||
kernel_tarball="linux-${version}.tar.gz"
|
local kernel_tarball="${version}.tar.gz"
|
||||||
tarball_name=$(get_from_kata_deps "assets.kernel.${tee}.tarball")
|
|
||||||
[ -z "$tarball_name" ] || kernel_tarball="$tarball_name"
|
|
||||||
|
|
||||||
if [ ! -f "${kernel_tarball}" ]; then
|
# Depending on where we're getting the terball from it may have a
|
||||||
curl --fail -OL "${kernel_url}/${kernel_tarball}"
|
# different name, such as linux-${version}.tar.gz or simply
|
||||||
fi
|
# ${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}
|
mkdir -p ${kernel_path}
|
||||||
tar --strip-components=1 -xf ${kernel_tarball} -C ${kernel_path}
|
tar --strip-components=1 -xf ${kernel_tarball} -C ${kernel_path}
|
||||||
|
@ -158,7 +158,6 @@ assets:
|
|||||||
description: "Linux kernel that supports TDX"
|
description: "Linux kernel that supports TDX"
|
||||||
url: "https://github.com/intel/linux-kernel-dcp/archive/refs/tags"
|
url: "https://github.com/intel/linux-kernel-dcp/archive/refs/tags"
|
||||||
tag: "SPR-BKC-PC-v9.6"
|
tag: "SPR-BKC-PC-v9.6"
|
||||||
tarball: "SPR-BKC-PC-v9.6.tar.gz"
|
|
||||||
sev:
|
sev:
|
||||||
description: "Linux kernel that supports SEV"
|
description: "Linux kernel that supports SEV"
|
||||||
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
|
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
|
||||||
|
Loading…
Reference in New Issue
Block a user