From e12f5e0a0823141f74a1a48a9b3de9511ff3606c Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Jul 20 2021 16:37:29 +0000
Subject: Re-add descriptor file for non secureboot x86_64 ovmf


We lost this in the RHEL sync, but we should still ship it

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/edk2-ovmf-nosb.json b/edk2-ovmf-nosb.json
new file mode 100644
index 0000000..355691b
--- /dev/null
+++ b/edk2-ovmf-nosb.json
@@ -0,0 +1,34 @@
+{
+    "description": "OVMF for x86_64, without SB, without SMM, with empty varstore",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "executable": {
+            "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+            "format": "raw"
+        },
+        "nvram-template": {
+            "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "x86_64",
+            "machines": [
+                "pc-i440fx-*",
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "acpi-s3",
+        "amd-sev",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/edk2.spec b/edk2.spec
index 13d0d5e..56ee41b 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -70,6 +70,7 @@ Source50: softfloat-%{softfloat_version}.tar.xz
 Source55: 40-edk2-ovmf-ia32-sb-enrolled.json
 Source56: 50-edk2-ovmf-ia32-sb.json
 Source57: 60-edk2-ovmf-ia32.json
+Source58: edk2-ovmf-nosb.json
 Source59: 70-edk2-arm-verbose.json
 
 Patch0008: 0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch
@@ -536,6 +537,11 @@ install -m 0644 edk2-aarch64-verbose.json \
 
 
 %if %{defined fedora}
+# Install extra x86_64 json files
+install -p -m 0644 edk2-ovmf-nosb.json \
+  %{buildroot}%{_datadir}/qemu/firmware/60-edk2-ovmf-nosb.json
+
+
 # install ia32
 cp -a ovmf-ia32 %{buildroot}%{_datadir}/%{name}
 
@@ -626,6 +632,9 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$')
 %{_datadir}/qemu/firmware/40-edk2-ovmf-sb.json
 %{_datadir}/qemu/firmware/50-edk2-ovmf-cc.json
 %{_datadir}/qemu/firmware/50-edk2-ovmf.json
+%if %{defined fedora}
+%{_datadir}/qemu/firmware/60-edk2-ovmf-nosb.json
+%endif
 # endif build_ovmf
 %endif