From 429a2758cc5c6e4293881d85de6f258c907a4300 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 12 Jul 2019 14:08:23 -0400
Subject: [PATCH] Copy VARS from plain ovmf/ to ovmf-ia32/

Apparently that works fine, but let's use explicit dirs
---
 40-edk2-ovmf-ia32-sb-enrolled.json | 2 +-
 50-edk2-ovmf-ia32-sb.json          | 2 +-
 60-edk2-ovmf-ia32.json             | 2 +-
 edk2.spec                          | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/40-edk2-ovmf-ia32-sb-enrolled.json b/40-edk2-ovmf-ia32-sb-enrolled.json
index 8a907de..08b95ee 100644
--- a/40-edk2-ovmf-ia32-sb-enrolled.json
+++ b/40-edk2-ovmf-ia32-sb-enrolled.json
@@ -10,7 +10,7 @@
             "format": "raw"
         },
         "nvram-template": {
-            "filename": "/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd",
+            "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.secboot.fd",
             "format": "raw"
         }
     },
diff --git a/50-edk2-ovmf-ia32-sb.json b/50-edk2-ovmf-ia32-sb.json
index cb7501d..df80f1e 100644
--- a/50-edk2-ovmf-ia32-sb.json
+++ b/50-edk2-ovmf-ia32-sb.json
@@ -10,7 +10,7 @@
             "format": "raw"
         },
         "nvram-template": {
-            "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+            "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
             "format": "raw"
         }
     },
diff --git a/60-edk2-ovmf-ia32.json b/60-edk2-ovmf-ia32.json
index d2cb1e8..d804b2e 100644
--- a/60-edk2-ovmf-ia32.json
+++ b/60-edk2-ovmf-ia32.json
@@ -10,7 +10,7 @@
             "format": "raw"
         },
         "nvram-template": {
-            "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
+            "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd",
             "format": "raw"
         }
     },
diff --git a/edk2.spec b/edk2.spec
index 53a57c7..62577a2 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -343,7 +343,9 @@ python3 qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator \
 %if 0%{?build_ovmf_ia32:1}
 mkdir -p ovmf-ia32
 build ${OVMF_FLAGS} -a IA32 -p OvmfPkg/OvmfPkgIa32.dsc
-cp Build/OvmfIa32/*/FV/OVMF_*.fd ovmf-ia32/
+cp Build/OvmfIa32/*/FV/OVMF_CODE*.fd ovmf-ia32/
+# cp VARS files from from ovmf/, which are all we need
+cp ovmf/OVMF_VARS*.fd ovmf-ia32/
 rm -rf Build/OvmfIa32
 
 # build ovmf-ia32 with secure boot