github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 04:34:27 +00:00
Code Issues Projects Releases Wiki Activity

versions: Adjust kernel names to match kata-deploy build targets

Browse Source 
Let's adjust the kernel names in versions.yaml so those can match the
names used as part of the kata-deploy local build scripts.

Right now this doesn't bring any benefit nor drawback, but it'll make
our life easier later on in this same series.

Depends-on: github.com/kata-containers/tests#5534

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-03-16 12:09:34 +01:00
parent d281d1b90a
commit 08fe49f708
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,7 +108,7 @@ install_kernel() {
#Install dragonball experimental kernel asset #Install dragonball experimental kernel asset
install_dragonball_experimental_kernel() { install_dragonball_experimental_kernel() {
info "build dragonball experimental kernel" info "build dragonball experimental kernel"
export kernel_version="$(yq r $versions_yaml assets.dragonball-kernel-experimental.version)" export kernel_version="$(yq r $versions_yaml assets.kernel-dragonball-experimental.version)"
info "kernel version ${kernel_version}" info "kernel version ${kernel_version}"
DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -e -t dragonball -v ${kernel_version} DESTDIR="${destdir}" PREFIX="${prefix}" "${kernel_builder}" -e -t dragonball -v ${kernel_version}
} }

4
tools/packaging/kernel/build-kernel.sh
View File

@ -556,7 +556,7 @@ main() {
case "${arch_target}" in case "${arch_target}" in
"aarch64") "aarch64")
build_type="arm-experimental" build_type="arm-experimental"
kernel_version=$(get_from_kata_deps "assets.arm-kernel-experimental.version") kernel_version=$(get_from_kata_deps "assets.kernel-arm-experimental.version")
;; ;;
*) *)
info "No arch-specific experimental kernel supported, using experimental one instead" info "No arch-specific experimental kernel supported, using experimental one instead"
@ -564,7 +564,7 @@ main() {
;; ;;
esac esac
elif [[ ${build_type} == "dragonball-experimental" ]]; then elif [[ ${build_type} == "dragonball-experimental" ]]; then
kernel_version=$(get_from_kata_deps "assets.dragonball-kernel-experimental.version") kernel_version=$(get_from_kata_deps "assets.kernel-dragonball-experimental.version")
elif [[ "${conf_guest}" != "" ]]; then elif [[ "${conf_guest}" != "" ]]; then
#If specifying a tag for kernel_version, must be formatted version-like to avoid unintended parsing issues #If specifying a tag for kernel_version, must be formatted version-like to avoid unintended parsing issues
kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.version" 2>/dev/null || true) kernel_version=$(get_from_kata_deps "assets.kernel.${conf_guest}.version" 2>/dev/null || true)

4
versions.yaml
View File

@ -177,12 +177,12 @@ assets:
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
tag: "v5.13.10" tag: "v5.13.10"
arm-kernel-experimental: kernel-arm-experimental:
description: "Linux kernel with cpu/mem hotplug support on arm64" description: "Linux kernel with cpu/mem hotplug support on arm64"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
version: "v5.15.7" version: "v5.15.7"
dragonball-kernel-experimental: kernel-dragonball-experimental:
description: "Linux kernel with Dragonball VMM optimizations like upcall" description: "Linux kernel with Dragonball VMM optimizations like upcall"
url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/" url: "https://cdn.kernel.org/pub/linux/kernel/v5.x/"
version: "v5.10.25" version: "v5.10.25"