From b1b2afe95778f5fe01e281d48b70ceadb14f8307 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 13 Dec 2023 13:42:35 +0100
Subject: [PATCH] switch the strictnx build to qcow2 (like all other 4M builds)

---
 edk2-build.fedora | 2 +-
 edk2.spec         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/edk2-build.fedora b/edk2-build.fedora
index c5f1d07..0bf1276 100644
--- a/edk2-build.fedora
+++ b/edk2-build.fedora
@@ -280,7 +280,7 @@ opts = ovmf.common
 pcds = nx.strict
 plat = OvmfX64
 dest = Fedora/experimental
-cpy1 = FV/OVMF_CODE.fd OVMF_CODE.4m.secboot.strictnx.fd
+cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.secboot.strictnx.fd
 
 [build.armvirt.aa64.strict.nx]
 desc = ArmVirt build for qemu, 64-bit (arm v8), verbose
diff --git a/edk2.spec b/edk2.spec
index 2463691..c3bb221 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -420,7 +420,7 @@ build_iso Fedora/ovmf-ia32
 cp DBXUpdate-%{DBXDATE}.x64.bin Fedora/ovmf
 cp DBXUpdate-%{DBXDATE}.ia32.bin Fedora/ovmf-ia32
 
-for raw in */ovmf/*_4M*.fd; do
+for raw in */{ovmf,experimental}/*_4M*.fd; do
     qcow2="${raw%.fd}.qcow2"
     qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2"
     rm -f "$raw"
@@ -729,6 +729,7 @@ done
 %dir %{_datadir}/%{name}/experimental
 %{_datadir}/%{name}/experimental/*.fd
 %{_datadir}/%{name}/experimental/*.raw
+%{_datadir}/%{name}/experimental/*.qcow2
 %{_datadir}/%{name}/experimental/*.pcr
 
 %files ovmf-xen