From aadad0c9b6dbc53a584cc105f3777ce2dc3c5db9 Mon Sep 17 00:00:00 2001
From: Kevin Zhao <kevin.zhao@linaro.org>
Date: Sat, 9 Aug 2025 00:08:28 +0800
Subject: [PATCH] CI: change the directory for Arm64 firmware

Previouly it is reusing the ovmf, which will enter some
issue for path checking, so move to aavmf as it should
be.

Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
---
 src/runtime/Makefile                            | 6 ++++--
 tools/packaging/static-build/ovmf/build-ovmf.sh | 6 +++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index 940338c8e6..b10bd0f3f6 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -16,9 +16,11 @@ ifeq ($(ARCH),)
 endif
 ifeq ($(ARCH),x86_64)
     override ARCH = amd64
+    override EDK2_NAME = ovmf
 endif
 ifeq ($(ARCH),aarch64)
     override ARCH = arm64
+    override EDK2_NAME = aavmf
 endif
 ifeq ($(ARCH),riscv64gc)
     override ARCH = riscv64
@@ -460,10 +462,10 @@ ifneq (,$(QEMUCMD))
     FIRMWAREPATH_NV := $(PREFIXDEPS)/share/ovmf/OVMF.fd
 
     ifneq (,$(QEMUFW))
-        FIRMWAREPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFW)
+        FIRMWAREPATH := $(PREFIXDEPS)/share/$(EDK2_NAME)/$(QEMUFW)
     endif
     ifneq (,$(QEMUFWVOL))
-        FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/ovmf/$(QEMUFWVOL)
+        FIRMWAREVOLUMEPATH := $(PREFIXDEPS)/share/$(EDK2_NAME)/$(QEMUFWVOL)
     endif
 endif
 
diff --git a/tools/packaging/static-build/ovmf/build-ovmf.sh b/tools/packaging/static-build/ovmf/build-ovmf.sh
index a649a3a33c..23f6e05585 100755
--- a/tools/packaging/static-build/ovmf/build-ovmf.sh
+++ b/tools/packaging/static-build/ovmf/build-ovmf.sh
@@ -84,7 +84,11 @@ fi
 popd
 
 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}"
 if [ "${ovmf_build}" == "sev" ]; then