From 06a1ed32c81b15278e6a78994213ee5cc12af962 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 5 Apr 2023 12:51:55 +0200
Subject: [PATCH] add json files for aarch64 qcow2 images

---
 50-edk2-aarch64-qcow2.json                    | 31 +++++++++++++++++++
 ...2-aarch64.json => 51-edk2-aarch64-raw.json |  0
 52-edk2-aarch64-verbose-qcow2.json            | 31 +++++++++++++++++++
 ...e.json => 53-edk2-aarch64-verbose-raw.json |  0
 edk2.spec                                     | 23 +++++++++-----
 5 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 50-edk2-aarch64-qcow2.json
 rename 50-edk2-aarch64.json => 51-edk2-aarch64-raw.json (100%)
 create mode 100644 52-edk2-aarch64-verbose-qcow2.json
 rename 51-edk2-aarch64-verbose.json => 53-edk2-aarch64-verbose-raw.json (100%)

diff --git a/50-edk2-aarch64-qcow2.json b/50-edk2-aarch64-qcow2.json
new file mode 100644
index 0000000..ec0f00f
--- /dev/null
+++ b/50-edk2-aarch64-qcow2.json
@@ -0,0 +1,31 @@
+{
+    "description": "UEFI firmware for ARM64 virtual machines",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.qcow2",
+            "format": "qcow2"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/aarch64/vars-template-pflash.qcow2",
+            "format": "qcow2"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "aarch64",
+            "machines": [
+                "virt-*"
+            ]
+        }
+    ],
+    "features": [
+
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/50-edk2-aarch64.json b/51-edk2-aarch64-raw.json
similarity index 100%
rename from 50-edk2-aarch64.json
rename to 51-edk2-aarch64-raw.json
diff --git a/52-edk2-aarch64-verbose-qcow2.json b/52-edk2-aarch64-verbose-qcow2.json
new file mode 100644
index 0000000..203be4b
--- /dev/null
+++ b/52-edk2-aarch64-verbose-qcow2.json
@@ -0,0 +1,31 @@
+{
+    "description": "UEFI firmware for ARM64 virtual machines, verbose logs",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.qcow2",
+            "format": "qcow2"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/aarch64/vars-template-pflash.qcow2",
+            "format": "qcow2"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "aarch64",
+            "machines": [
+                "virt-*"
+            ]
+        }
+    ],
+    "features": [
+        "verbose-static"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/51-edk2-aarch64-verbose.json b/53-edk2-aarch64-verbose-raw.json
similarity index 100%
rename from 51-edk2-aarch64-verbose.json
rename to 53-edk2-aarch64-verbose-raw.json
diff --git a/edk2.spec b/edk2.spec
index 4fa104d..69216fd 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -56,8 +56,10 @@ Source4: edk2-platforms-54306d023e7d.tar.xz
 Source5: jansson-2.13.1.tar.bz2
 
 # json description files
-Source10: 50-edk2-aarch64.json
-Source11: 51-edk2-aarch64-verbose.json
+Source10: 50-edk2-aarch64-qcow2.json
+Source11: 51-edk2-aarch64-raw.json
+Source12: 52-edk2-aarch64-verbose-qcow2.json
+Source13: 53-edk2-aarch64-verbose-raw.json
 
 Source20: 50-edk2-arm-verbose.json
 
@@ -157,6 +159,9 @@ BuildArch:  noarch
 Provides:   AAVMF = %{version}-%{release}
 Obsoletes:  AAVMF < 20180508-100.gitee3198e672e2.el7
 
+# need libvirt version with qcow2 support
+Conflicts:  libvirt-daemon-driver-qemu < 9.2.0
+
 # No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack.
 Provides:   bundled(openssl) = %{OPENSSL_VER}
 License:    BSD-2-Clause-Patent and OpenSSL
@@ -281,7 +286,7 @@ tar -xf %{SOURCE5} --strip-components=1 --directory RedfishPkg/Library/JsonLib/j
 chmod -Rf a+rX,u+w,g-w,o-w .
 
 cp -a -- \
-   %{SOURCE10} %{SOURCE11} \
+   %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
    %{SOURCE20} \
    %{SOURCE30} %{SOURCE31} %{SOURCE32} \
    %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE43} %{SOURCE44} %{SOURCE45} \
@@ -479,8 +484,10 @@ ln -s ../%{name}/arm/QEMU_EFI-pflash.raw \
 
 # json description files
 install -m 0644 \
-        50-edk2-aarch64.json \
-        51-edk2-aarch64-verbose.json \
+        50-edk2-aarch64-qcow2.json \
+        51-edk2-aarch64-raw.json \
+        52-edk2-aarch64-verbose-qcow2.json \
+        53-edk2-aarch64-verbose-raw.json \
         %{buildroot}%{_datadir}/qemu/firmware
 %if %{defined fedora}
 install -m 0644 \
@@ -580,8 +587,10 @@ done
 %{_datadir}/%{name}/aarch64/BL32_AP_MM.fd
 %{_datadir}/%{name}/aarch64/QEMU_EFI.kernel.fd
 %endif
-%{_datadir}/qemu/firmware/50-edk2-aarch64.json
-%{_datadir}/qemu/firmware/51-edk2-aarch64-verbose.json
+%{_datadir}/qemu/firmware/50-edk2-aarch64-qcow2.json
+%{_datadir}/qemu/firmware/51-edk2-aarch64-raw.json
+%{_datadir}/qemu/firmware/52-edk2-aarch64-verbose-qcow2.json
+%{_datadir}/qemu/firmware/53-edk2-aarch64-verbose-raw.json
 # endif build_aarch64
 %endif