From 40f4eef5355fcac66a8de519393f69338e447de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 15 Feb 2023 16:38:26 +0100 Subject: [PATCH] build: Use the correct kernel name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When calling `MAKE_KERNEL_NAME` we're considering the default kernel name will be `vmlinux.container` or `vmlinuz.container`, which is not the case as the runtime-rs, when used with dragonball, relies on the `vmlinu[zx]-dragonball-experimental.container` kernel. Other hypervisors will have to introduce a similar `MAKE_KERNEL_NAME_${HYPERVISOR}` to adapt this to the kernel they want to use, similarly to what's already done for the go runtime. By doing this we also ensure that no changes in the configuration file will be required to run runtime-rs, with dragonball, as part of our CI or as part of kata-deploy. Fixes: #6290 Signed-off-by: Fabiano Fidêncio --- src/runtime-rs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index 4c17fe36ca..599949bb07 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -203,7 +203,7 @@ ifneq (,$(DBCMD)) DEFNETWORKMODEL_DB := tcfilter KERNELPARAMS = console=ttyS1 agent.log_vport=1025 KERNELTYPE_DB = uncompressed - KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME,$(KERNELTYPE_DB)) + KERNEL_NAME_DB = $(call MAKE_KERNEL_NAME_DB,$(KERNELTYPE_DB)) KERNELPATH_DB = $(KERNELDIR)/$(KERNEL_NAME_DB) DEFSANDBOXCGROUPONLY = true RUNTIMENAME := virt_container @@ -371,8 +371,8 @@ endef # Returns the name of the kernel file to use based on the provided KERNELTYPE. # $1 : KERNELTYPE (compressed or uncompressed) -define MAKE_KERNEL_NAME -$(if $(findstring uncompressed,$1),vmlinux.container,vmlinuz.container) +define MAKE_KERNEL_NAME_DB +$(if $(findstring uncompressed,$1),vmlinux-dragonball-experimental.container,vmlinuz-dragonball-experimental.container) endef .DEFAULT_GOAL := default