From d6157b62fb0fafa483fbe5cfa30c95eeda116d30 Mon Sep 17 00:00:00 2001 From: "alex.lyn" Date: Tue, 8 Jul 2025 15:05:02 +0800 Subject: [PATCH] runtime-rs: Add configurable TDX items when make build It enables the related tdx items when do make build. Signed-off-by: alex.lyn --- src/runtime-rs/Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index ea31c73716..bb225aa6e2 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -284,6 +284,18 @@ ifneq (,$(QEMUCMD)) CONFIGS += $(CONFIG_QEMU) + CONFIG_FILE_QEMU_TDX = configuration-qemu-tdx-runtime-rs.toml + CONFIG_QEMU_TDX = config/$(CONFIG_FILE_QEMU_TDX) + CONFIG_QEMU_TDX_IN = $(CONFIG_QEMU_TDX).in + + CONFIG_PATH_QEMU_TDX = $(abspath $(CONFDIR)/$(CONFIG_FILE_QEMU_TDX)) + CONFIG_PATHS += $(CONFIG_PATH_QEMU_TDX) + + SYSCONFIG_QEMU_TDX = $(abspath $(SYSCONFDIR)/$(CONFIG_FILE_QEMU_TDX)) + SYSCONFIG_PATHS += $(SYSCONFIG_QEMU_TDX) + + CONFIGS += $(CONFIG_QEMU_TDX) + CONFIG_FILE_QEMU_SE = configuration-qemu-se-runtime-rs.toml CONFIG_QEMU_SE = config/$(CONFIG_FILE_QEMU_SE) CONFIG_QEMU_SE_IN = $(CONFIG_QEMU_SE).in @@ -301,6 +313,10 @@ ifneq (,$(QEMUCMD)) KERNEL_NAME_QEMU = $(call MAKE_KERNEL_NAME,$(KERNELTYPE_QEMU)) KERNELPATH_QEMU = $(KERNELDIR)/$(KERNEL_NAME_QEMU) + KERNEL_CONFIDENTIAL_TYPE = compressed + KERNEL_CONFIDENTIAL_NAME = $(call MAKE_KERNEL_CONFIDENTIAL_NAME,$(KERNEL_CONFIDENTIAL_TYPE)) + KERNELCONFIDENTIALPATH = $(KERNELDIR)/$(KERNEL_CONFIDENTIAL_NAME) + KERNEL_NAME_QEMU_SE = kata-containers-se.img KERNELPATH_QEMU_SE = $(KERNELDIR)/$(KERNEL_NAME_QEMU_SE) @@ -420,6 +436,7 @@ USER_VARS += KERNELDIR USER_VARS += KERNELTYPE USER_VARS += KERNELPATH_DB USER_VARS += KERNELPATH_QEMU +USER_VARS += KERNELCONFIDENTIALPATH USER_VARS += KERNELPATH_QEMU_SE USER_VARS += KERNELPATH_FC USER_VARS += KERNELPATH @@ -605,6 +622,10 @@ define MAKE_KERNEL_NAME $(if $(findstring uncompressed,$1),vmlinux.container,vmlinuz.container) endef +define MAKE_KERNEL_CONFIDENTIAL_NAME +$(if $(findstring uncompressed,$1),vmlinux-confidential.container,vmlinuz-confidential.container) +endef + .DEFAULT_GOAL := default GENERATED_FILES += $(CONFIGS)