diff --git a/tools/packaging/kata-deploy/local-build/Makefile b/tools/packaging/kata-deploy/local-build/Makefile index e307a7fc20..34f025ca1a 100644 --- a/tools/packaging/kata-deploy/local-build/Makefile +++ b/tools/packaging/kata-deploy/local-build/Makefile @@ -33,7 +33,6 @@ BASE_TARBALLS = serial-targets \ qemu-tdx-experimental-tarball \ stratovirt-tarball \ shim-v2-tarball \ - tdvf-tarball \ virtiofsd-tarball BASE_SERIAL_TARBALLS = rootfs-image-tarball \ rootfs-image-confidential-tarball \ @@ -166,9 +165,6 @@ runk-tarball: shim-v2-tarball: ${MAKE} $@-build -tdvf-tarball: - ${MAKE} $@-build - trace-forwarder-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 a34bc06a36..3a5b096e2b 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -119,7 +119,6 @@ options: rootfs-initrd-mariner runk shim-v2 - tdvf trace-forwarder virtiofsd EOF @@ -736,7 +735,6 @@ install_ovmf() { local component_name="ovmf" [ "${ovmf_type}" == "sev" ] && component_name="ovmf-sev" - [ "${ovmf_type}" == "tdx" ] && component_name="tdvf" latest_artefact="$(get_from_kata_deps "externals.ovmf.${ovmf_type}.version")" latest_builder_image="$(get_ovmf_image_name)" @@ -753,11 +751,6 @@ install_ovmf() { tar xvf "${builddir}/${tarball_name}" -C "${destdir}" } -# Install TDVF -install_tdvf() { - install_ovmf "tdx" "edk2-tdx.tar.gz" -} - # Install OVMF SEV install_ovmf_sev() { install_ovmf "sev" "edk2-sev.tar.gz" @@ -970,7 +963,6 @@ handle_build() { install_stratovirt install_runk install_shimv2 - install_tdvf install_trace_forwarder install_virtiofsd ;; @@ -1035,8 +1027,6 @@ handle_build() { shim-v2) install_shimv2 ;; - tdvf) install_tdvf ;; - trace-forwarder) install_trace_forwarder ;; virtiofsd) install_virtiofsd ;; diff --git a/tools/packaging/static-build/ovmf/build-ovmf.sh b/tools/packaging/static-build/ovmf/build-ovmf.sh index b873074587..49d3a51dc3 100755 --- a/tools/packaging/static-build/ovmf/build-ovmf.sh +++ b/tools/packaging/static-build/ovmf/build-ovmf.sh @@ -77,9 +77,6 @@ popd info "Install fd to destdir" install_dir="${DESTDIR}/${PREFIX}/share/ovmf" -if [ "${ovmf_build}" == "tdx" ]; then - install_dir="$DESTDIR/$PREFIX/share/tdvf" -fi mkdir -p "${install_dir}" if [ "${ovmf_build}" == "sev" ]; then diff --git a/versions.yaml b/versions.yaml index e0413a92dc..3ee117917f 100644 --- a/versions.yaml +++ b/versions.yaml @@ -337,12 +337,6 @@ externals: version: "edk2-stable202302" package: "OvmfPkg/AmdSev/AmdSevX64.dsc" package_output_dir: "AmdSev" - tdx: - # yamllint disable-line rule:line-length - description: "QEMU with TDX support - based on https://github.com/intel/tdx-tools/releases/tag/2023ww15" - version: "edk2-stable202302" - package: "OvmfPkg/IntelTdx/IntelTdxX64.dsc" - package_output_dir: "IntelTdx" td-shim: description: "Confidential Containers Shim Firmware"