From a618461d3a29f56697f7dd94dc932af4c71aefaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 12 Jan 2024 18:30:25 +0100 Subject: [PATCH] runtime: Add confidential kernel to the makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this we can properly generate and the the `-confidential` kernel, which supports SEV / SNP / TDX as part of our configuration files. Signed-off-by: Fabiano FidĂȘncio --- src/runtime/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 69d77b532c..8a75ddd58e 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -390,6 +390,10 @@ ifneq (,$(QEMUCMD)) KERNELSNPNAME = $(call MAKE_KERNEL_SNP_NAME,$(KERNELSNPTYPE)) KERNELSNPPATH = $(KERNELDIR)/$(KERNELSNPNAME) + KERNELCONFIDENTIALTYPE = compressed + KERNELCONFIDENTIALNAME = $(call MAKE_KERNEL_CONFIDENTIAL_NAME,$(KERNELCONFIDENTIALTYPE)) + KERNELCONFIDENTIALPATH = $(KERNELDIR)/$(KERNELCONFIDENTIALNAME) + KERNELSENAME = kata-containers-se.img KERNELSEPATH = $(KERNELDIR)/$(KERNELSENAME) endif @@ -585,6 +589,7 @@ USER_VARS += KERNELTYPE_ACRN USER_VARS += KERNELTYPE_CLH USER_VARS += KERNELPATH_ACRN USER_VARS += KERNELPATH +USER_VARS += KERNELCONFIDENTIALPATH USER_VARS += KERNELSEVPATH USER_VARS += KERNELTDXPATH USER_VARS += KERNELSNPPATH @@ -786,6 +791,10 @@ define MAKE_KERNEL_SNP_NAME $(if $(findstring uncompressed,$1),vmlinux-sev.container,vmlinuz-sev.container) endef +define MAKE_KERNEL_CONFIDENTIAL_NAME +$(if $(findstring uncompressed,$1),vmlinux-confidential.container,vmlinuz-confidential.container) +endef + GENERATED_FILES += pkg/katautils/config-settings.go $(RUNTIME_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary