github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-15 22:53:43 +00:00
Code Issues Projects Releases Wiki Activity

CC: static build switching sev ovmf to CC fork

Browse Source 
Switching sev build of ovmf to the cc fork until patches are upstreamed.

Adding build for dependencies

Fixes: #5892
Signed-off-by: Alex Carter <Alex.Carter@ibm.com>
This commit is contained in:
Alex Carter 2022-12-12 19:02:46 +00:00
parent 7257470fdc
commit 8c96bd5c7c
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/packaging/static-build/ovmf/Dockerfile
View File

@ -14,9 +14,15 @@ RUN apt-get update && \
git \ git \
iasl \ iasl \
make \ make \
nasm \
python \ python \
python3 \ python3 \
python3-distutils \ python3-distutils \
uuid-dev && \ uuid-dev && \
apt-get clean && rm -rf /var/lib/lists/ apt-get clean && rm -rf /var/lib/lists/ && \
cd /tmp && curl -fsLO https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz && \
tar xf nasm-2.15.05.tar.gz && \
cd nasm-2.15.05 && \
./configure && \
make -j"$(nproc)" && \
make install && \
cd /tmp && rm -r nasm-2.15.05*

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

@ -42,6 +42,7 @@ git submodule init
git submodule update git submodule update
info "Using BaseTools make target" info "Using BaseTools make target"
export PYTHON_COMMAND=python3
make -C BaseTools/ make -C BaseTools/
info "Calling edksetup script" info "Calling edksetup script"

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

@ -24,11 +24,17 @@ ovmf_package="${ovmf_package:-}"
package_output_dir="${package_output_dir:-}" package_output_dir="${package_output_dir:-}"
if [ -z "$ovmf_repo" ]; then if [ -z "$ovmf_repo" ]; then
if [ "${ovmf_build}" == "tdx" ]; then case "${ovmf_build}" in
ovmf_repo=$(get_from_kata_deps "externals.ovmf.tdx.url" "${kata_version}") "tdx")
else ovmf_repo=$(get_from_kata_deps "externals.ovmf.tdx.url" "${kata_version}")
ovmf_repo=$(get_from_kata_deps "externals.ovmf.url" "${kata_version}") ;;
fi "sev")
ovmf_repo=$(get_from_kata_deps "externals.ovmf.sev.url" "${kata_version}")
;;
*)
ovmf_repo=$(get_from_kata_deps "externals.ovmf.url" "${kata_version}")
;;
esac
fi fi
[ -n "$ovmf_repo" ] || die "failed to get ovmf repo" [ -n "$ovmf_repo" ] || die "failed to get ovmf repo"

5
versions.yaml
View File

@ -294,7 +294,10 @@ externals:
package_output_dir: "OvmfX64" package_output_dir: "OvmfX64"
sev: sev:
description: "AmdSev build needed for SEV measured direct boot." description: "AmdSev build needed for SEV measured direct boot."
version: "edk2-stable202202" #CCv0 switching to this fork until new release of edk2 has fix
#per #5893, will need to be reverted to upstream
url: "https://github.com/kata-containers/edk2"
version: "edk2-202208-sev-alloc-runtime-secret-area"
package: "OvmfPkg/AmdSev/AmdSevX64.dsc" package: "OvmfPkg/AmdSev/AmdSevX64.dsc"
package_output_dir: "AmdSev" package_output_dir: "AmdSev"
tdx: tdx: