github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-04 10:24:37 +00:00
Code Issues Projects Releases Wiki Activity

versions: build: Remove TDX specific OVMF (TDVF)

Browse Source 
Let's remove everything related to the TDVF building / shipping from our
repo, as we'll be relying on the one coming from the distro.

Later on, we may need to re-add TDVF logic, as we're already using
upstream edk2 repo / content, but when that's needed we'll simply revert
this commit.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2024-05-08 12:01:12 +02:00
parent 946f0bdfff
commit 4292c4c3b1
4 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kata-deploy/local-build/Makefile
View File

@@ -33,7 +33,6 @@ BASE_TARBALLS = serial-targets \
qemu-tdx-experimental-tarball \ qemu-tdx-experimental-tarball \
stratovirt-tarball \ stratovirt-tarball \
shim-v2-tarball \ shim-v2-tarball \
tdvf-tarball \
virtiofsd-tarball virtiofsd-tarball
BASE_SERIAL_TARBALLS = rootfs-image-tarball \ BASE_SERIAL_TARBALLS = rootfs-image-tarball \
rootfs-image-confidential-tarball \ rootfs-image-confidential-tarball \
@@ -166,9 +165,6 @@ runk-tarball:
shim-v2-tarball: shim-v2-tarball:
${MAKE} $@-build ${MAKE} $@-build
tdvf-tarball:
${MAKE} $@-build
trace-forwarder-tarball: trace-forwarder-tarball:
${MAKE} $@-build ${MAKE} $@-build

10
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -119,7 +119,6 @@ options:
rootfs-initrd-mariner rootfs-initrd-mariner
runk runk
shim-v2 shim-v2
tdvf
trace-forwarder trace-forwarder
virtiofsd virtiofsd
EOF EOF
@@ -736,7 +735,6 @@ install_ovmf() {
local component_name="ovmf" local component_name="ovmf"
[ "${ovmf_type}" == "sev" ] && component_name="ovmf-sev" [ "${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_artefact="$(get_from_kata_deps "externals.ovmf.${ovmf_type}.version")"
latest_builder_image="$(get_ovmf_image_name)" latest_builder_image="$(get_ovmf_image_name)"
@@ -753,11 +751,6 @@ install_ovmf() {
tar xvf "${builddir}/${tarball_name}" -C "${destdir}" 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() { install_ovmf_sev() {
install_ovmf "sev" "edk2-sev.tar.gz" install_ovmf "sev" "edk2-sev.tar.gz"
@@ -970,7 +963,6 @@ handle_build() {
install_stratovirt install_stratovirt
install_runk install_runk
install_shimv2 install_shimv2
install_tdvf
install_trace_forwarder install_trace_forwarder
install_virtiofsd install_virtiofsd
;; ;;
@@ -1035,8 +1027,6 @@ handle_build() {
shim-v2) install_shimv2 ;; shim-v2) install_shimv2 ;;
tdvf) install_tdvf ;;
trace-forwarder) install_trace_forwarder ;; trace-forwarder) install_trace_forwarder ;;
virtiofsd) install_virtiofsd ;; virtiofsd) install_virtiofsd ;;

3
tools/packaging/static-build/ovmf/build-ovmf.sh
View File

@@ -77,9 +77,6 @@ popd
info "Install fd to destdir" info "Install fd to destdir"
install_dir="${DESTDIR}/${PREFIX}/share/ovmf" install_dir="${DESTDIR}/${PREFIX}/share/ovmf"
if [ "${ovmf_build}" == "tdx" ]; then
install_dir="$DESTDIR/$PREFIX/share/tdvf"
fi
mkdir -p "${install_dir}" mkdir -p "${install_dir}"
if [ "${ovmf_build}" == "sev" ]; then if [ "${ovmf_build}" == "sev" ]; then

6
versions.yaml
View File

@@ -337,12 +337,6 @@ externals:
version: "edk2-stable202302" version: "edk2-stable202302"
package: "OvmfPkg/AmdSev/AmdSevX64.dsc" package: "OvmfPkg/AmdSev/AmdSevX64.dsc"
package_output_dir: "AmdSev" 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: td-shim:
description: "Confidential Containers Shim Firmware" description: "Confidential Containers Shim Firmware"