rpms
/
edk2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop /ovmf-4m/, move 4M builds to /ovmf/ instead

This commit is contained in:
Gerd Hoffmann 2023-05-17 12:01:54 +02:00
parent d88cf988d3
commit 79081dd581
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json
View File

@ -7,11 +7,11 @@
"device": "flash", "device": "flash",
"mode" : "split", "mode" : "split",
"executable": { "executable": {
"filename": "/usr/share/edk2/ovmf-4m/OVMF_CODE.secboot.qcow2", "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2",
"format": "qcow2" "format": "qcow2"
}, },
"nvram-template": { "nvram-template": {
"filename": "/usr/share/edk2/ovmf-4m/OVMF_VARS.secboot.qcow2", "filename": "/usr/share/edk2/ovmf/OVMF_VARS_4M.secboot.qcow2",
"format": "qcow2" "format": "qcow2"
} }
}, },

4
40-edk2-ovmf-4m-qcow2-x64-sb.json
View File

@ -7,11 +7,11 @@
"device": "flash", "device": "flash",
"mode" : "split", "mode" : "split",
"executable": { "executable": {
"filename": "/usr/share/edk2/ovmf-4m/OVMF_CODE.secboot.qcow2", "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2",
"format": "qcow2" "format": "qcow2"
}, },
"nvram-template": { "nvram-template": {
"filename": "/usr/share/edk2/ovmf-4m/OVMF_VARS.qcow2", "filename": "/usr/share/edk2/ovmf/OVMF_VARS_4M.qcow2",
"format": "qcow2" "format": "qcow2"
} }
}, },

4
50-edk2-ovmf-4m-qcow2-x64-nosb.json
View File

@ -7,11 +7,11 @@
"device": "flash", "device": "flash",
"mode" : "split", "mode" : "split",
"executable": { "executable": {
"filename": "/usr/share/edk2/ovmf-4m/OVMF_CODE.qcow2", "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2",
"format": "qcow2" "format": "qcow2"
}, },
"nvram-template": { "nvram-template": {
"filename": "/usr/share/edk2/ovmf-4m/OVMF_VARS.qcow2", "filename": "/usr/share/edk2/ovmf/OVMF_VARS_4M.qcow2",
"format": "qcow2" "format": "qcow2"
} }
}, },

10
edk2-build.fedora
View File

@ -71,9 +71,9 @@ arch = X64
opts = ovmf.common opts = ovmf.common
ovmf.4m ovmf.4m
plat = OvmfX64 plat = OvmfX64
dest = Fedora/ovmf-4m dest = Fedora/ovmf
cpy1 = FV/OVMF_CODE.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.fd
cpy2 = FV/OVMF_VARS.fd cpy2 = FV/OVMF_VARS.fd OVMF_VARS_4M.fd
[build.ovmf.2m.sb.smm] [build.ovmf.2m.sb.smm]
desc = ovmf build (32/64-bit, 2MB, q35 only, needs smm, secure boot) desc = ovmf build (32/64-bit, 2MB, q35 only, needs smm, secure boot)
@ -95,8 +95,8 @@ opts = ovmf.common
ovmf.4m ovmf.4m
ovmf.sb.smm ovmf.sb.smm
plat = Ovmf3264 plat = Ovmf3264
dest = Fedora/ovmf-4m dest = Fedora/ovmf
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.secboot.fd
##################################################################### #####################################################################

23
edk2.spec
View File

@ -362,8 +362,8 @@ virt-fw-vars --input Fedora/ovmf/OVMF_VARS.fd \
--output Fedora/ovmf/OVMF_VARS.secboot.fd \ --output Fedora/ovmf/OVMF_VARS.secboot.fd \
--set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \
--enroll-redhat --secure-boot --enroll-redhat --secure-boot
virt-fw-vars --input Fedora/ovmf-4m/OVMF_VARS.fd \ virt-fw-vars --input Fedora/ovmf/OVMF_VARS_4M.fd \
--output Fedora/ovmf-4m/OVMF_VARS.secboot.fd \ --output Fedora/ovmf/OVMF_VARS_4M.secboot.fd \
--set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \
--enroll-redhat --secure-boot --enroll-redhat --secure-boot
virt-fw-vars --input Fedora/ovmf-ia32/OVMF_VARS.fd \ virt-fw-vars --input Fedora/ovmf-ia32/OVMF_VARS.fd \
@ -373,7 +373,7 @@ virt-fw-vars --input Fedora/ovmf-ia32/OVMF_VARS.fd \
build_iso Fedora/ovmf build_iso Fedora/ovmf
build_iso Fedora/ovmf-ia32 build_iso Fedora/ovmf-ia32
for raw in */ovmf-4m/*.fd; do for raw in */ovmf/*_4M*.fd; do
qcow2="${raw%.fd}.qcow2" qcow2="${raw%.fd}.qcow2"
qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2" qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2"
rm -f "$raw" rm -f "$raw"
@ -387,10 +387,13 @@ virt-fw-vars --input Fedora/experimental/OVMF.stateless.fd \
for image in \ for image in \
Fedora/ovmf/OVMF_CODE.secboot.fd \ Fedora/ovmf/OVMF_CODE.secboot.fd \
Fedora/ovmf-4m/OVMF_CODE.secboot.qcow2 \ Fedora/ovmf/OVMF_CODE_4M.secboot.qcow2 \
Fedora/experimental/OVMF.stateless.secboot.fd \ Fedora/experimental/OVMF.stateless.secboot.fd \
; do ; do
pcr="${image%.fd}.pcr" pcr="${image}"
pcr="${pcr%.fd}"
pcr="${pcr%.qcow2}"
pcr="${pcr}.pcr"
python3 /usr/share/doc/python3-virt-firmware/experimental/measure.py \ python3 /usr/share/doc/python3-virt-firmware/experimental/measure.py \
--image "$image" \ --image "$image" \
--version "%{name}-%{version}-%{release}" \ --version "%{name}-%{version}-%{release}" \
@ -578,13 +581,11 @@ done
%if %{defined fedora} %if %{defined fedora}
%{_datadir}/%{name}/ovmf/MICROVM.fd %{_datadir}/%{name}/ovmf/MICROVM.fd
%{_datadir}/qemu/firmware/50-edk2-ovmf-x64-microvm.json %{_datadir}/qemu/firmware/50-edk2-ovmf-x64-microvm.json
%dir %{_datadir}/%{name}/ovmf-4m/ %{_datadir}/%{name}/ovmf/OVMF_CODE_4M.qcow2
%{_datadir}/%{name}/ovmf-4m/OVMF_CODE.qcow2 %{_datadir}/%{name}/ovmf/OVMF_CODE_4M.secboot.qcow2
%{_datadir}/%{name}/ovmf-4m/OVMF_CODE.secboot.qcow2 %{_datadir}/%{name}/ovmf/OVMF_VARS_4M.qcow2
%{_datadir}/%{name}/ovmf-4m/OVMF_VARS.qcow2 %{_datadir}/%{name}/ovmf/OVMF_VARS_4M.secboot.qcow2
%{_datadir}/%{name}/ovmf-4m/OVMF_VARS.secboot.qcow2
%{_datadir}/%{name}/ovmf/*.pcr %{_datadir}/%{name}/ovmf/*.pcr
%{_datadir}/%{name}/ovmf-4m/*.pcr
%endif %endif
# endif build_ovmf # endif build_ovmf
%endif %endif