From 502844ced95ae1d65c1c10a6aaccd6287d250eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 23 Mar 2023 09:33:46 +0100 Subject: [PATCH] local-build: Add support to build Kernel for TDX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's add the needed targets and modifications to be able to build kernel-tdx-experimental as part of the local-build scripts. Signed-off-by: Fabiano FidĂȘncio --- tools/packaging/kata-deploy/local-build/Makefile | 4 ++++ .../local-build/kata-deploy-binaries.sh | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 80069258fb8..49f46cc8036 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -25,6 +25,7 @@ all: serial-targets \ firecracker-tarball \ kernel-tarball \ kernel-dragonball-experimental-tarball \ + kernel-tdx-experimental-tarball \ nydus-tarball \ qemu-tarball \ qemu-tdx-experimental-tarball \ @@ -55,6 +56,9 @@ kernel-dragonball-experimental-tarball: kernel-experimental-tarball: ${MAKE} $@-build +kernel-tdx-experimental-tarball: + ${MAKE} $@-build + nydus-tarball: ${MAKE} $@-build diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index b73df7d750a..a31dd9c65b4 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -80,6 +80,7 @@ options: kernel kernel-dragonball-experimental kernel-experimental + kernel-tdx-experimental nydus qemu qemu-tdx-experimental @@ -218,6 +219,16 @@ install_kernel_experimental() { "-f -b experimental" } +#Install experimental TDX kernel asset +install_kernel_tdx_experimental() { + local kernel_url="$(get_from_kata_deps assets.kernel-tdx-experimental.url)" + + install_kernel_helper \ + "assets.kernel-tdx-experimental.version" \ + "kernel-tdx-experimental" \ + "-x tdx -u ${kernel_url}" +} + install_qemu_helper() { local qemu_repo_yaml_path="${1}" local qemu_version_yaml_path="${2}" @@ -387,6 +398,7 @@ handle_build() { install_initrd install_kernel install_kernel_dragonball_experimental + install_kernel_tdx_experimental install_nydus install_qemu install_qemu_tdx_experimental @@ -406,6 +418,8 @@ handle_build() { kernel-experimental) install_kernel_experimental ;; + kernel-tdx-experimental) install_kernel_tdx_experimental ;; + qemu) install_qemu ;; qemu-tdx-experimental) install_qemu_tdx_experimental ;;