From f599c8e0095499808f6e7ea8af684c0da8483305 Mon Sep 17 00:00:00 2001 From: Jia He Date: Mon, 9 Mar 2020 12:05:27 +0800 Subject: [PATCH] kernel: Install uncompressed kernel by Image instead of vmlinux on arm64 arm64 does not use vmlinux to boot, Image is used instead. Otherwise, kata can't boot from vmlinux.container Besides, given that firecracker only supports booting from Image, don't set vmlinux for firecracker target Fixes #930 Signed-off-by: Jia He --- kernel/build-kernel.sh | 5 +++-- kernel/kata_config_version | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/build-kernel.sh b/kernel/build-kernel.sh index 6718d62005..86000fb0ef 100755 --- a/kernel/build-kernel.sh +++ b/kernel/build-kernel.sh @@ -376,14 +376,15 @@ install_kata() { die "failed to find image" fi + # Install compressed kernel if [ "${arch_target}" = "powerpc" ]; then install --mode 0644 -D "vmlinux" "${install_path}/${vmlinuz}" else install --mode 0644 -D "${bzImage}" "${install_path}/${vmlinuz}" fi - if [ "${hypervisor_target}" == "firecracker" ] && [ "${arch_target}" == "arm64" ]; then - vmlinux="${vmlinux}-${hypervisor_target}" + # Install uncompressed kernel + if [ "${arch_target}" = "arm64" ]; then install --mode 0644 -D "arch/${arch_target}/boot/Image" "${install_path}/${vmlinux}" else install --mode 0644 -D "vmlinux" "${install_path}/${vmlinux}" diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 38b10c1b2b..b5489e5e51 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -68 +69