rpms/ipxe
6
0
Fork 0
Code Issues Pull Requests Releases Activity

tweaks to qemu images

Browse Source 
Allow removing IA32 EFI images from combined oproms.
Check that the ROMs fit in 256K and pad them.
This commit is contained in:
Philippe Mathieu-Daudé 2019-07-16 23:30:34 +02:00 committed by Paolo Bonzini
parent 1af6b08f14
commit 44f30ae08c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipxe.spec
View File

@ -1,5 +1,6 @@
%if 0%{?fedora} %if 0%{?fedora}
%global cross 1 %global cross 1
%global efi_ia32 1
%endif %endif
# Resulting binary formats we want from iPXE # Resulting binary formats we want from iPXE
@ -49,7 +50,7 @@
Name: ipxe Name: ipxe
Version: %{date} Version: %{date}
Release: 1.git%{hash}%{?dist} Release: 2.git%{hash}%{?dist}
Summary: A network boot loader Summary: A network boot loader
License: GPLv2 with additional permissions and BSD License: GPLv2 with additional permissions and BSD
@ -159,16 +160,24 @@ make_ipxe ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin \
mkdir bin-combined mkdir bin-combined
for rom in %{qemuroms}; do for rom in %{qemuroms}; do
make_ipxe CONFIG=qemu bin/${rom}.rom make_ipxe CONFIG=qemu bin/${rom}.rom
%if 0%{?efi_ia32}
make_ipxe CONFIG=qemu bin-i386-efi/${rom}.efidrv make_ipxe CONFIG=qemu bin-i386-efi/${rom}.efidrv
%endif
make_ipxe CONFIG=qemu bin-x86_64-efi/${rom}.efidrv make_ipxe CONFIG=qemu bin-x86_64-efi/${rom}.efidrv
vid="0x${rom%%????}" vid="0x${rom%%????}"
did="0x${rom#????}" did="0x${rom#????}"
EfiRom -f "$vid" -i "$did" --pci23 \ EfiRom -f "$vid" -i "$did" --pci23 \
-b bin/${rom}.rom \ -b bin/${rom}.rom \
%if 0%{?efi_ia32}
-ec bin-i386-efi/${rom}.efidrv \ -ec bin-i386-efi/${rom}.efidrv \
%endif
-ec bin-x86_64-efi/${rom}.efidrv \ -ec bin-x86_64-efi/${rom}.efidrv \
-o bin-combined/${rom}.rom -o bin-combined/${rom}.rom
EfiRom -d bin-combined/${rom}.rom EfiRom -d bin-combined/${rom}.rom
# truncate to at least 256KiB
truncate -s \>256K bin-combined/${rom}.rom
# verify rom fits in 256KiB
test $(stat -c '%s' bin-combined/${rom}.rom) -le $((256 * 1024))
done done
%endif %endif
@ -231,6 +240,10 @@ done
%endif %endif
%changelog %changelog
* Tue Jul 16 2019 Paolo Bonzini <pbonxini@redhat.com> - 20190125-2.git36a4c85f
- Allow removing IA32 EFI images from combined oproms
- Check that the ROMs fit in 256K and pad them
* Tue Feb 12 2019 Daniel P. Berrangé <berrange@redhat.com> - 20190125-1.git36a4c85f * Tue Feb 12 2019 Daniel P. Berrangé <berrange@redhat.com> - 20190125-1.git36a4c85f
- Update to latest git snapshot - Update to latest git snapshot