From cf0ca265f993537d485cb6e381cf5b12b87309dd Mon Sep 17 00:00:00 2001 From: Tobin Feldman-Fitzthum Date: Fri, 21 Apr 2023 18:36:09 +0000 Subject: [PATCH] local-build: Add x86_64 OVMF target Add targets to build the "plain" x86_64 OVMF. This will be used by anyone who is using SEV or SNP without kernel hashes. The SNP QEMU does not yet support kernel hashes so the OvmfPkg will be used by default. Signed-off-by: Tobin Feldman-Fitzthum Signed-off-by: Alex Carter --- tools/packaging/kata-deploy/local-build/Makefile | 4 ++++ .../kata-deploy/local-build/kata-deploy-binaries.sh | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index a7c3234448..fc3bbcb6e5 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -31,6 +31,7 @@ all: serial-targets \ kernel-gpu-tdx-experimental-tarball \ nydus-tarball \ ovmf-sev-tarball \ + ovmf-tarball \ qemu-snp-experimental-tarball \ qemu-tarball \ qemu-tdx-experimental-tarball \ @@ -84,6 +85,9 @@ nydus-tarball: ovmf-sev-tarball: ${MAKE} $@-build +ovmf-tarball: + ${MAKE} $@-build + qemu-snp-experimental-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 cf2953c7fb..7b80d000ef 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -87,6 +87,7 @@ options: kernel-gpu-snp kernel-gpu-tdx-experimental nydus + ovmf ovmf-sev qemu qemu-snp-experimental @@ -532,6 +533,7 @@ handle_build() { install_kernel_dragonball_experimental install_kernel_tdx_experimental install_nydus + install_ovmf install_ovmf_sev install_qemu install_qemu_snp_experimental @@ -547,8 +549,6 @@ handle_build() { kernel) install_kernel ;; - nydus) install_nydus ;; - kernel-dragonball-experimental) install_kernel_dragonball_experimental ;; kernel-experimental) install_kernel_experimental ;; @@ -557,14 +557,18 @@ handle_build() { kernel-sev) install_kernel_sev ;; - ovmf-sev) install_ovmf_sev ;; - kernel-gpu) install_kernel_gpu ;; kernel-gpu-snp) install_kernel_gpu_snp;; kernel-gpu-tdx-experimental) install_kernel_gpu_tdx_experimental;; + nydus) install_nydus ;; + + ovmf) install_ovmf ;; + + ovmf-sev) install_ovmf_sev ;; + qemu) install_qemu ;; qemu-snp-experimental) install_qemu_snp_experimental ;;