switch the strictnx build to qcow2 (like all other 4M builds)

This commit is contained in:
Gerd Hoffmann 2023-12-13 13:42:35 +01:00
parent c17e4f232c
commit b1b2afe957
2 changed files with 3 additions and 2 deletions

View File

@ -280,7 +280,7 @@ opts = ovmf.common
pcds = nx.strict pcds = nx.strict
plat = OvmfX64 plat = OvmfX64
dest = Fedora/experimental dest = Fedora/experimental
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.4m.secboot.strictnx.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.secboot.strictnx.fd
[build.armvirt.aa64.strict.nx] [build.armvirt.aa64.strict.nx]
desc = ArmVirt build for qemu, 64-bit (arm v8), verbose desc = ArmVirt build for qemu, 64-bit (arm v8), verbose

View File

@ -420,7 +420,7 @@ build_iso Fedora/ovmf-ia32
cp DBXUpdate-%{DBXDATE}.x64.bin Fedora/ovmf cp DBXUpdate-%{DBXDATE}.x64.bin Fedora/ovmf
cp DBXUpdate-%{DBXDATE}.ia32.bin Fedora/ovmf-ia32 cp DBXUpdate-%{DBXDATE}.ia32.bin Fedora/ovmf-ia32
for raw in */ovmf/*_4M*.fd; do for raw in */{ovmf,experimental}/*_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"
@ -729,6 +729,7 @@ done
%dir %{_datadir}/%{name}/experimental %dir %{_datadir}/%{name}/experimental
%{_datadir}/%{name}/experimental/*.fd %{_datadir}/%{name}/experimental/*.fd
%{_datadir}/%{name}/experimental/*.raw %{_datadir}/%{name}/experimental/*.raw
%{_datadir}/%{name}/experimental/*.qcow2
%{_datadir}/%{name}/experimental/*.pcr %{_datadir}/%{name}/experimental/*.pcr
%files ovmf-xen %files ovmf-xen