github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 16:57:18 +00:00
Code Issues Projects Releases Wiki Activity

build: kernel: Always pass the url to the builder

Browse Source 
This doesn't change much on how we're doing things Today, but it
simplifies a lot cases that may be added later on (and will be) like
building -rc kernels.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
This commit is contained in:
Fabiano Fidêncio 2024-11-01 11:11:26 +01:00
parent ee1a17cffc
commit 9f2d4b2956
1 changed files with 6 additions and 10 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

@ -540,10 +540,12 @@ install_kernel_helper() {
local extra_tarballs="" local extra_tarballs=""
export kernel_version="$(get_from_kata_deps .${kernel_yaml_path}.version)" export kernel_version="$(get_from_kata_deps .${kernel_yaml_path}.version)"
export kernel_url="$(get_from_kata_deps .${kernel_yaml_path}.url)"
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
kernel_version="$(get_from_kata_deps .assets.kernel.confidential.version)" kernel_version="$(get_from_kata_deps .assets.kernel.confidential.version)"
kernel_url="$(get_from_kata_deps .assets.kernel.confidential.url)"
fi fi
if [[ "${kernel_name}" == "kernel"*"-confidential" ]]; then if [[ "${kernel_name}" == "kernel"*"-confidential" ]]; then
@ -564,7 +566,7 @@ install_kernel_helper() {
info "build ${kernel_name}" info "build ${kernel_name}"
info "Kernel version ${kernel_version}" info "Kernel version ${kernel_version}"
DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -v "${kernel_version}" -f "${extra_cmd}" DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -v "${kernel_version}" -f -u "${kernel_url}" "${extra_cmd}"
} }
#Install kernel asset #Install kernel asset
@ -576,14 +578,12 @@ install_kernel() {
} }
install_kernel_confidential() { install_kernel_confidential() {
local kernel_url="$(get_from_kata_deps .assets.kernel.confidential.url)"
export MEASURED_ROOTFS=yes export MEASURED_ROOTFS=yes
install_kernel_helper \ install_kernel_helper \
"assets.kernel.confidential" \ "assets.kernel.confidential" \
"kernel-confidential" \ "kernel-confidential" \
"-x -u ${kernel_url}" "-x"
} }
install_kernel_dragonball_experimental() { install_kernel_dragonball_experimental() {
@ -602,22 +602,18 @@ install_kernel_nvidia_gpu_dragonball_experimental() {
#Install GPU enabled kernel asset #Install GPU enabled kernel asset
install_kernel_nvidia_gpu() { install_kernel_nvidia_gpu() {
local kernel_url="$(get_from_kata_deps .assets.kernel.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel" \ "assets.kernel" \
"kernel-nvidia-gpu" \ "kernel-nvidia-gpu" \
"-g nvidia -u ${kernel_url} -H deb" "-g nvidia -H deb"
} }
#Install GPU and TEE enabled kernel asset #Install GPU and TEE enabled kernel asset
install_kernel_nvidia_gpu_confidential() { install_kernel_nvidia_gpu_confidential() {
local kernel_url="$(get_from_kata_deps .assets.kernel.confidential.url)"
install_kernel_helper \ install_kernel_helper \
"assets.kernel.confidential" \ "assets.kernel.confidential" \
"kernel-nvidia-gpu-confidential" \ "kernel-nvidia-gpu-confidential" \
"-x -g nvidia -u ${kernel_url} -H deb" "-x -g nvidia -H deb"
} }
install_qemu_helper() { install_qemu_helper() {