From aac8fd18e11ec7213dedb7f867db4499e0ca2ea7 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 16 Nov 2022 16:24:30 +0100
Subject: [PATCH] json: drop edk2-ovmf-cc.json

---
 edk2-ovmf-cc.json | 33 ---------------------------------
 edk2.spec         | 10 +++-------
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 edk2-ovmf-cc.json

diff --git a/edk2-ovmf-cc.json b/edk2-ovmf-cc.json
deleted file mode 100644
index 68ac090..0000000
--- a/edk2-ovmf-cc.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "description": "OVMF with SEV-ES support",
-    "interface-types": [
-        "uefi"
-    ],
-    "mapping": {
-        "device": "flash",
-        "executable": {
-            "filename": "/usr/share/edk2/ovmf/OVMF_CODE.cc.fd",
-            "format": "raw"
-        },
-        "nvram-template": {
-            "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
-            "format": "raw"
-        }
-    },
-    "targets": [
-        {
-            "architecture": "x86_64",
-            "machines": [
-                "pc-q35-*"
-            ]
-        }
-    ],
-    "features": [
-        "amd-sev",
-        "amd-sev-es",
-        "verbose-dynamic"
-    ],
-    "tags": [
-
-    ]
-}
diff --git a/edk2.spec b/edk2.spec
index bdfedd6..b908a69 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -52,9 +52,8 @@ Source10: edk2-aarch64-verbose.json
 Source11: edk2-aarch64.json
 Source12: edk2-ovmf-sb.json
 Source13: edk2-ovmf.json
-Source14: edk2-ovmf-cc.json
-Source15: edk2-ovmf-amdsev.json
-Source16: edk2-ovmf-inteltdx.json
+Source14: edk2-ovmf-amdsev.json
+Source15: edk2-ovmf-inteltdx.json
 
 # Fedora specific sources
 Source50: softfloat-%{softfloat_version}.tar.xz
@@ -233,7 +232,7 @@ git config am.keepcr true
 
 cp -a -- %{SOURCE1} .
 cp -a -- %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
-cp -a -- %{SOURCE14} %{SOURCE15} %{SOURCE16} .
+cp -a -- %{SOURCE14} %{SOURCE15} .
 cp -a -- %{SOURCE80} %{SOURCE81} %{SOURCE82} .
 tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
 
@@ -365,8 +364,6 @@ install -m 0644 edk2-ovmf-sb.json \
   %{buildroot}%{_datadir}/qemu/firmware/40-edk2-ovmf-sb.json
 install -m 0644 edk2-ovmf.json \
   %{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf.json
-install -m 0644 edk2-ovmf-cc.json \
-  %{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf-cc.json
 install -m 0644 edk2-ovmf-amdsev.json \
   %{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf-amdsev.json
 install -m 0644 edk2-ovmf-inteltdx.json \
@@ -472,7 +469,6 @@ done
 %{_datadir}/%{name}/ovmf/Shell.efi
 %{_datadir}/%{name}/ovmf/EnrollDefaultKeys.efi
 %{_datadir}/qemu/firmware/40-edk2-ovmf-sb.json
-%{_datadir}/qemu/firmware/50-edk2-ovmf-cc.json
 %{_datadir}/qemu/firmware/50-edk2-ovmf-amdsev.json
 %{_datadir}/qemu/firmware/50-edk2-ovmf-inteltdx.json
 %{_datadir}/qemu/firmware/50-edk2-ovmf.json