diff --git a/ipxe.spec b/ipxe.spec index 3c088f8..f18d3c2 100644 --- a/ipxe.spec +++ b/ipxe.spec @@ -3,9 +3,6 @@ %global efi_ia32 1 %endif -# Resulting binary formats we want from iPXE -%global formats rom - # PCI IDs (vendor,product) of the ROMS we want for QEMU # # pcnet32: 0x1022 0x2000 @@ -194,13 +191,11 @@ pushd src/bin/ cp -a undionly.kpxe ipxe.{iso,usb,dsk,lkrn} %{buildroot}/%{_datadir}/%{name}/ -for fmt in %{formats};do - for img in *.${fmt};do - if [ -e $img ]; then - cp -a $img %{buildroot}/%{_datadir}/%{name}/ - echo %{_datadir}/%{name}/$img >> ../../${fmt}.list +for img in *.rom; do + if [ -e $img ]; then + cp -a $img %{buildroot}/%{_datadir}/%{name}/ + echo %{_datadir}/%{name}/$img >> ../../rom.list fi - done done popd @@ -209,13 +204,10 @@ cp -a src/bin-x86_64-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/ipxe-x86_64.e # the roms supported by qemu will be packaged separatedly # remove from the main rom list and add them to qemu.list -for fmt in rom ;do - for rom in %{qemuroms} ; do - sed -i -e "/\/${rom}.${fmt}/d" ${fmt}.list - echo %{_datadir}/%{name}/${rom}.${fmt} >> qemu.${fmt}.list - done -done for rom in %{qemuroms}; do + sed -i -e "/\/${rom}.rom/d" rom.list + echo %{_datadir}/%{name}/${rom}.rom >> qemu.rom.list + cp src/bin-combined/${rom}.rom %{buildroot}/%{_datadir}/%{name}.efi/ echo %{_datadir}/%{name}.efi/${rom}.rom >> qemu.rom.list done