diff --git a/ipxe.spec b/ipxe.spec index 778b5bb..60e6729 100644 --- a/ipxe.spec +++ b/ipxe.spec @@ -53,7 +53,7 @@ Name: ipxe Version: %{date} -Release: 2.git%{hash}%{?dist} +Release: 3.git%{hash}%{?dist} Summary: A network boot loader License: GPLv2 with additional permissions and BSD @@ -175,12 +175,15 @@ for rom in %{qemuroms}; do vid="0x${rom%%????}" did="0x${rom#????}" EfiRom -f "$vid" -i "$did" --pci23 \ - -b bin/${rom}.rom \ %if 0%{?efi_ia32} -ec bin-i386-efi/${rom}.efidrv \ %endif -ec bin-x86_64-efi/${rom}.efidrv \ - -o bin-combined/${rom}.rom + -o bin-combined/${rom}.eficrom + util/catrom.pl \ + bin/${rom}.rom \ + bin-combined/${rom}.eficrom \ + > bin-combined/${rom}.rom EfiRom -d bin-combined/${rom}.rom # truncate to at least 256KiB truncate -s \>256K bin-combined/${rom}.rom @@ -243,6 +246,9 @@ done %endif %changelog +* Tue Feb 23 2021 Cole Robinson - 20200823-3.git4bd064de +- combine BIOS and EFI roms using "util/catrom.pl" + * Tue Jan 26 2021 Fedora Release Engineering - 20200823-2.git4bd064de - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild