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

Merge 1a3e3ffbf3 into 9379a18c8a

Browse Source
This commit is contained in:
Kevin Zhao 2025-08-12 16:59:29 +08:00 committed by GitHub
commit 5443e8c50f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/Makefile
View File

@ -465,6 +465,13 @@ ifneq (,$(QEMUCMD))
ifneq (,$(QEMUFWVOL)) ifneq (,$(QEMUFWVOL))
FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFWVOL) FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFWVOL)
endif endif
ifneq (,$(QEMUFW_ARM64))
FIRMWAREPATH := $(PREFIXDEPS)/share/aavmf/$(QEMUFW_ARM64)
endif
ifneq (,$(QEMUFWVOL_ARM64))
FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/aavmf/$(QEMUFWVOL_ARM64)
endif
endif endif
ifneq (,$(CLHCMD)) ifneq (,$(CLHCMD))

4
src/runtime/arch/arm64-options.mk
View File

@ -11,8 +11,8 @@ MACHINEACCELERATORS :=
CPUFEATURES := pmu=off CPUFEATURES := pmu=off
QEMUCMD := qemu-system-aarch64 QEMUCMD := qemu-system-aarch64
QEMUFW := AAVMF_CODE.fd QEMUFW_ARM64 := AAVMF_CODE.fd
QEMUFWVOL := AAVMF_VARS.fd QEMUFWVOL_ARM64 := AAVMF_VARS.fd
# Firecracker binary name # Firecracker binary name
FCCMD := firecracker FCCMD := firecracker

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

@ -84,7 +84,11 @@ fi
popd popd
info "Install fd to destdir" info "Install fd to destdir"
install_dir="${DESTDIR}/${PREFIX}/share/ovmf" if [ "${ovmf_build}" == "arm64" ]; then
install_dir="${DESTDIR}/${PREFIX}/share/aavmf"
else
install_dir="${DESTDIR}/${PREFIX}/share/ovmf"
fi
mkdir -p "${install_dir}" mkdir -p "${install_dir}"
if [ "${ovmf_build}" == "sev" ]; then if [ "${ovmf_build}" == "sev" ]; then