github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-24 18:52:08 +00:00
Code Issues Projects Releases Wiki Activity

CC: kata-deploy add x86 ovmf build for SNP

Browse Source 
SNP needs two builds of ovmf: the AmdSev build and the normal x86_64 build.

Adds target for vanilla ovmf build for snp

Adding another make target / kata-deploy function, and fixing the ovmf builder so these builds dont overlap.

Fixes: #5849

Signed-off-by: Alex Carter <Alex.Carter@ibm.com>
This commit is contained in:
Alex Carter 2022-12-01 16:05:25 +00:00
parent b1afabdef0
commit 594aa178b3
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/cc-payload-after-push-amd64.yaml vendored
View File

@ -19,6 +19,7 @@ jobs:
- cc-virtiofsd - cc-virtiofsd
- cc-sev-kernel - cc-sev-kernel
- cc-sev-ovmf - cc-sev-ovmf
- cc-x86_64-ovmf
- cc-sev-rootfs-initrd - cc-sev-rootfs-initrd
- cc-tdx-kernel - cc-tdx-kernel
- cc-tdx-rootfs-image - cc-tdx-rootfs-image

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

@ -17,6 +17,7 @@ EXTRA_TARBALL=cc-cloud-hypervisor-tarball \
cc-tdx-td-shim-tarball \ cc-tdx-td-shim-tarball \
cc-tdx-tdvf-tarball \ cc-tdx-tdvf-tarball \
cc-sev-ovmf-tarball \ cc-sev-ovmf-tarball \
cc-x86_64-ovmf-tarball \
cc-sev-rootfs-initrd-tarball \ cc-sev-rootfs-initrd-tarball \
cc-tdx-rootfs-image-tarball cc-tdx-rootfs-image-tarball
endif endif
@ -152,3 +153,6 @@ cc-tdx-tdvf-tarball:
cc-sev-ovmf-tarball: cc-sev-ovmf-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-x86_64-ovmf-tarball:
${MAKE} $@-build

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

@ -105,6 +105,7 @@ options:
cc-shimv2 cc-shimv2
cc-virtiofsd cc-virtiofsd
cc-sev-ovmf cc-sev-ovmf
cc-x86_64-ovmf
EOF EOF
exit "${return_code}" exit "${return_code}"
@ -540,6 +541,10 @@ install_cc_sev_ovmf(){
install_cc_tee_ovmf "sev" "edk2-sev.tar.gz" install_cc_tee_ovmf "sev" "edk2-sev.tar.gz"
} }
install_cc_x86_64_ovmf(){
install_cc_tee_ovmf "x86_64" "edk2-x86_64.tar.gz"
}
#Install guest image #Install guest image
install_image() { install_image() {
info "Create image" info "Create image"
@ -709,6 +714,8 @@ handle_build() {
cc-tdx-tdvf) install_cc_tdx_tdvf ;; cc-tdx-tdvf) install_cc_tdx_tdvf ;;
cc-sev-ovmf) install_cc_sev_ovmf ;; cc-sev-ovmf) install_cc_sev_ovmf ;;
cc-x86_64-ovmf) install_cc_x86_64_ovmf ;;
cloud-hypervisor) install_clh ;; cloud-hypervisor) install_clh ;;

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

@ -79,9 +79,11 @@ 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 case "${ovmf_build}" in
install_dir="$DESTDIR/$PREFIX/share/tdvf" "tdx")
fi install_dir="$DESTDIR/$PREFIX/share/tdvf"
;;
esac
mkdir -p "${install_dir}" mkdir -p "${install_dir}"
if [ "${ovmf_build}" == "sev" ]; then if [ "${ovmf_build}" == "sev" ]; then