github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 17:33:02 +00:00
Code Issues Projects Releases Wiki Activity

build: kernel: Pass the yaml base path instead of the version path

Browse Source 
By doing this we can ensure this can be re-used, if needed (and it'll be
needed), for also getting the URL.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
This commit is contained in:
Fabiano Fidêncio 2024-11-01 11:07:33 +01:00
parent 7057ff1cd5
commit cc4006297a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,12 +534,12 @@ install_cached_kernel_tarball_component() {
#Install kernel asset #Install kernel asset
install_kernel_helper() { install_kernel_helper() {
local kernel_version_yaml_path="${1}" local kernel_yaml_path="${1}"
local kernel_name="${2}" local kernel_name="${2}"
local extra_cmd="${3:-}" local extra_cmd="${3:-}"
local extra_tarballs="" local extra_tarballs=""
export kernel_version="$(get_from_kata_deps .${kernel_version_yaml_path})" export kernel_version="$(get_from_kata_deps .${kernel_yaml_path}.version)"
export kernel_kata_config_version="$(cat ${repo_root_dir}/tools/packaging/kernel/kata_config_version)" export kernel_kata_config_version="$(cat ${repo_root_dir}/tools/packaging/kernel/kata_config_version)"
if [[ "${kernel_name}" == "kernel"*"-confidential" ]]; then if [[ "${kernel_name}" == "kernel"*"-confidential" ]]; then
@ -570,7 +570,7 @@ install_kernel_helper() {
#Install kernel asset #Install kernel asset
install_kernel() { install_kernel() {
install_kernel_helper \ install_kernel_helper \
"assets.kernel.version" \ "assets.kernel" \
"kernel" \ "kernel" \
"" ""
} }
@ -581,21 +581,21 @@ install_kernel_confidential() {
export MEASURED_ROOTFS=yes export MEASURED_ROOTFS=yes
install_kernel_helper \ install_kernel_helper \
"assets.kernel.confidential.version" \ "assets.kernel.confidential" \
"kernel-confidential" \ "kernel-confidential" \
"-x -u ${kernel_url}" "-x -u ${kernel_url}"
} }
install_kernel_dragonball_experimental() { install_kernel_dragonball_experimental() {
install_kernel_helper \ install_kernel_helper \
"assets.kernel-dragonball-experimental.version" \ "assets.kernel-dragonball-experimental" \
"kernel-dragonball-experimental" \ "kernel-dragonball-experimental" \
"-e -t dragonball" "-e -t dragonball"
} }
install_kernel_nvidia_gpu_dragonball_experimental() { install_kernel_nvidia_gpu_dragonball_experimental() {
install_kernel_helper \ install_kernel_helper \
"assets.kernel-dragonball-experimental.version" \ "assets.kernel-dragonball-experimental" \
"kernel-dragonball-experimental" \ "kernel-dragonball-experimental" \
"-e -t dragonball -g nvidia -H deb" "-e -t dragonball -g nvidia -H deb"
} }
@ -605,7 +605,7 @@ install_kernel_nvidia_gpu() {
local kernel_url="$(get_from_kata_deps .assets.kernel.url)" local kernel_url="$(get_from_kata_deps .assets.kernel.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel.version" \ "assets.kernel" \
"kernel-nvidia-gpu" \ "kernel-nvidia-gpu" \
"-g nvidia -u ${kernel_url} -H deb" "-g nvidia -u ${kernel_url} -H deb"
} }
@ -615,7 +615,7 @@ install_kernel_nvidia_gpu_confidential() {
local kernel_url="$(get_from_kata_deps .assets.kernel.confidential.url)" local kernel_url="$(get_from_kata_deps .assets.kernel.confidential.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel.confidential.version" \ "assets.kernel.confidential" \
"kernel-nvidia-gpu-confidential" \ "kernel-nvidia-gpu-confidential" \
"-x -g nvidia -u ${kernel_url} -H deb" "-x -g nvidia -u ${kernel_url} -H deb"
} }