From 72672376600ff49e5604f28b54737c6985bb1e03 Mon Sep 17 00:00:00 2001 From: Unmesh Deodhar Date: Mon, 6 Mar 2023 13:41:53 -0600 Subject: [PATCH 1/2] packaging: remove duplicate sev kernel build Remove duplicate SEV kernel builds. Fixes: #6415 Signed-off-by: Unmesh Deodhar --- tools/packaging/kata-deploy/local-build/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index 1cad20d314..28202e90e7 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -13,7 +13,6 @@ ARCH := $(shell uname -m) ifeq ($(ARCH), x86_64) EXTRA_TARBALL=cc-cloud-hypervisor-tarball \ cc-tdx-kernel-tarball \ - cc-sev-kernel-tarball \ cc-tdx-qemu-tarball \ cc-tdx-td-shim-tarball \ cc-tdx-tdvf-tarball \ From 9afa38f11b588bfb047b8550c5dc795ded312a30 Mon Sep 17 00:00:00 2001 From: Unmesh Deodhar Date: Mon, 6 Mar 2023 17:13:28 -0600 Subject: [PATCH 2/2] packaging: add kernel modules dir Create a directory where kernel modules will be extracted. Fixes: #6418 Signed-off-by: Unmesh Deodhar --- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 765c349171..1476ca33f6 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -421,7 +421,8 @@ install_cached_kernel_component() { "kata-static-cc-sev-kernel-modules.tar.xz" \ "${workdir}/kata-static-cc-sev-kernel-modules.tar.xz" \ || return 1 - + + mkdir -p "${module_dir}" tar xvf "${workdir}/kata-static-cc-sev-kernel-modules.tar.xz" -C "${module_dir}" && return 0 return 1