github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-12 20:39:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5771 from fidencio/topic/CC-export-kernel-version

Browse Source 
CC | build: export kernel_version to be used with its build script
This commit is contained in:
Fabiano Fidêncio
2022-11-25 15:51:55 +01:00
committed by GitHub
parent 56f798eac2 8baee93fca
commit 32fa47e59e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -195,6 +195,7 @@ install_cc_tee_kernel() {
[[ "${tee}" != "tdx" && "${tee}" != "sev" ]] && die "Non supported TEE" [[ "${tee}" != "tdx" && "${tee}" != "sev" ]] && die "Non supported TEE"
info "build initramfs for tee kernel" info "build initramfs for tee kernel"
export kernel_version=${kernel_version}
"${initramfs_builder}" "${initramfs_builder}"
kernel_url="$(yq r $versions_yaml assets.kernel.${tee}.url)" kernel_url="$(yq r $versions_yaml assets.kernel.${tee}.url)"
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -x "${tee}" -v "${kernel_version}" -u "${kernel_url}" DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -x "${tee}" -v "${kernel_version}" -u "${kernel_url}"

2
tools/packaging/static-build/kernel/build.sh
View File

@@ -69,7 +69,7 @@ check_cached_kernel() {
install_cached_kernel() { install_cached_kernel() {
local kernel_directory="${cached_path}/tools/packaging/kata-deploy/local-build/build/cc-kernel/destdir/opt/confidential-containers/share/kata-containers" local kernel_directory="${cached_path}/tools/packaging/kata-deploy/local-build/build/cc-kernel/destdir/opt/confidential-containers/share/kata-containers"
local vmlinux_kernel_name="vmlinux-${cached_kernel_version}-${cached_kernel_config}" local vmlinux_kernel_name="vmlinux-${cached_kernel_version}-${cached_kernel_config}"
local vmlinuz_kernel_name="vmlinuz-${cached_kernel_version}-${cached_kernel_config}" local vmlinuz_kernel_name="vmlinuz-${cached_kernel_version}-${cached_kernel_config}"
mkdir -p "${kernel_directory}" mkdir -p "${kernel_directory}"
pushd "${kernel_directory}" pushd "${kernel_directory}"