Copy VARS from plain ovmf/ to ovmf-ia32/

Apparently that works fine, but let's use explicit dirs
This commit is contained in:
Cole Robinson 2019-07-12 14:08:23 -04:00
parent 674b3c8a27
commit 429a2758cc
4 changed files with 6 additions and 4 deletions

View File

@ -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"
}
},

View File

@ -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"
}
},

View File

@ -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"
}
},

View File

@ -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