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

Merge pull request #11670 from kevinzs2048/add-aavmf

Browse Source 
CI: change the directory for Arm64 firmware
This commit is contained in:
RuoqingHe
2025-08-14 21:30:21 +08:00
committed by GitHub
parent 479cce8406 aadad0c9b6
commit 65a9fe0063
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/runtime/Makefile
View File

@@ -16,9 +16,11 @@ ifeq ($(ARCH),)
endif endif
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
override ARCH = amd64 override ARCH = amd64
override EDK2_NAME = ovmf
endif endif
ifeq ($(ARCH),aarch64) ifeq ($(ARCH),aarch64)
override ARCH = arm64 override ARCH = arm64
override EDK2_NAME = aavmf
endif endif
ifeq ($(ARCH),riscv64gc) ifeq ($(ARCH),riscv64gc)
override ARCH = riscv64 override ARCH = riscv64
@@ -460,10 +462,10 @@ ifneq (,$(QEMUCMD))
FIRMWAREPATH_NV := $(PREFIXDEPS)/share/ovmf/OVMF.fd FIRMWAREPATH_NV := $(PREFIXDEPS)/share/ovmf/OVMF.fd
ifneq (,$(QEMUFW)) ifneq (,$(QEMUFW))
FIRMWAREPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFW) FIRMWAREPATH := $(PREFIXDEPS)/share/$(EDK2_NAME)/$(QEMUFW)
endif endif
ifneq (,$(QEMUFWVOL)) ifneq (,$(QEMUFWVOL))
FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFWVOL) FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/$(EDK2_NAME)/$(QEMUFWVOL)
endif endif
endif endif

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