Skip to content

Commit

Permalink
kernel: Install uncompressed kernel by Image instead of
Browse files Browse the repository at this point in the history
 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 <justin.he@arm.com>
  • Loading branch information
justin-he committed Mar 9, 2020
1 parent b99f8f7 commit f599c8e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions kernel/build-kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion kernel/kata_config_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
68
69

0 comments on commit f599c8e

Please sign in to comment.