diff --git a/ipxe.spec b/ipxe.spec index ddc005a..53b05f5 100644 --- a/ipxe.spec +++ b/ipxe.spec @@ -39,7 +39,7 @@ Name: ipxe Version: %{date} -Release: 3.git%{hash}%{?dist} +Release: 4.git%{hash}%{?dist} Summary: A network boot loader License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND (GPL-2.0-only OR MPL-1.1) AND GPL-2.0-or-later AND GPL-2.0-or-later WITH UBDL-exception AND ISC AND MIT @@ -75,38 +75,22 @@ Obsoletes: gpxe <= 1.0.1 %ifarch x86_64 %package bootimgs-x86 -Summary: X86 Network boot loader images in bootable USB, CD, floppy and GRUB formats +Summary: X86 Network boot loader images BuildArch: noarch Provides: %{name}-bootimgs = %{version}-%{release} Obsoletes: %{name}-bootimgs < 20200823-9.git4bd064de Obsoletes: gpxe-bootimgs <= 1.0.1 -%package roms -Summary: Network boot loader roms in .rom format -Requires: %{name}-roms-qemu = %{version}-%{release} -BuildArch: noarch -Obsoletes: gpxe-roms <= 1.0.1 - %package roms-qemu Summary: Network boot loader roms supported by QEMU, .rom format BuildArch: noarch Obsoletes: gpxe-roms-qemu <= 1.0.1 %description bootimgs-x86 -iPXE is an open source network bootloader. It provides a direct -replacement for proprietary PXE ROMs, with many extra features such as -DNS, HTTP, iSCSI, etc. - -This package contains the iPXE boot images in USB, CD, floppy, and PXE -UNDI formats. - -%description roms -iPXE is an open source network bootloader. It provides a direct -replacement for proprietary PXE ROMs, with many extra features such as -DNS, HTTP, iSCSI, etc. - -This package contains the iPXE roms in .rom format. +iPXE is an open source network bootloader. +This package contains iPXE x86 boot images for UEFI (snponly.efi) and +BIOS (undionly.kpxe). %description roms-qemu iPXE is an open source network bootloader. It provides a direct @@ -119,15 +103,13 @@ This package contains the iPXE ROMs for devices emulated by QEMU, in %ifarch aarch64 %package bootimgs-aarch64 -Summary: ARM Network boot loader images in bootable USB and GRUB formats +Summary: ARM Network boot loader images BuildArch: noarch %description bootimgs-aarch64 -iPXE is an open source network bootloader. It provides a direct -replacement for proprietary PXE ROMs, with many extra features such as -DNS, HTTP, iSCSI, etc. +iPXE is an open source network bootloader. -This package contains the iPXE ARM boot images in USB and GRUB formats. +This package contains iPXE aarch64 boot images for UEFI (snponly.efi). %endif %description @@ -155,12 +137,10 @@ make_ipxe() { %ifarch x86_64 -make_ipxe bin-i386-efi/ipxe.efi bin-x86_64-efi/ipxe.efi \ - bin-x86_64-efi/snponly.efi +make_ipxe bin-x86_64-efi/snponly.efi make_ipxe ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin \ - bin/undionly.kpxe bin/ipxe.{dsk,iso,usb,lkrn} \ - allroms + bin/undionly.kpxe # build roms with efi support for qemu mkdir bin-combined @@ -189,29 +169,17 @@ done %ifarch aarch64 make_ipxe bin-arm64-efi/snponly.efi -%if 0%{?fedora} -make_ipxe bin-arm64-efi/ipxe.efi -%endif %endif %install %ifarch x86_64 mkdir -p %{buildroot}/%{_datadir}/%{name}/ mkdir -p %{buildroot}/%{_datadir}/%{name}.efi/ + pushd src/bin/ - -cp -a undionly.kpxe ipxe.{iso,usb,dsk,lkrn} %{buildroot}/%{_datadir}/%{name}/ - -for img in *.rom; do - if [ -e $img ]; then - cp -a $img %{buildroot}/%{_datadir}/%{name}/ - echo %{_datadir}/%{name}/$img >> ../../rom.list - fi -done +cp -a undionly.kpxe %{buildroot}/%{_datadir}/%{name}/ popd -cp -a src/bin-i386-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/ipxe-i386.efi -cp -a src/bin-x86_64-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/ipxe-x86_64.efi cp -a src/bin-x86_64-efi/snponly.efi %{buildroot}/%{_datadir}/%{name}/ipxe-snponly-x86_64.efi mkdir -p %{buildroot}%{_datadir}/%{name}/qemu/ @@ -221,9 +189,9 @@ for romstr in %{qemuroms}; do # remove from the main rom list and add them to qemu.list rom=$(echo "$romstr" | cut -d ":" -f 1) qemuname=$(echo "$romstr" | cut -d ":" -f 2) - sed -i -e "/\/${rom}.rom/d" rom.list echo %{_datadir}/%{name}/${rom}.rom >> qemu.rom.list + cp src/bin/${rom}.rom %{buildroot}/%{_datadir}/%{name}/ cp src/bin-combined/${rom}.rom %{buildroot}/%{_datadir}/%{name}.efi/ echo %{_datadir}/%{name}.efi/${rom}.rom >> qemu.rom.list @@ -238,28 +206,15 @@ done %ifarch aarch64 mkdir -p %{buildroot}/%{_datadir}/%{name}/arm64-efi cp -a src/bin-arm64-efi/snponly.efi %{buildroot}/%{_datadir}/%{name}/arm64-efi/snponly.efi -%if 0%{?fedora} -cp -a src/bin-arm64-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/arm64-efi/ipxe.efi -%endif %endif %ifarch x86_64 %files bootimgs-x86 %dir %{_datadir}/%{name} -%{_datadir}/%{name}/ipxe.iso -%{_datadir}/%{name}/ipxe.usb -%{_datadir}/%{name}/ipxe.dsk -%{_datadir}/%{name}/ipxe.lkrn -%{_datadir}/%{name}/ipxe-i386.efi -%{_datadir}/%{name}/ipxe-x86_64.efi %{_datadir}/%{name}/undionly.kpxe %{_datadir}/%{name}/ipxe-snponly-x86_64.efi %doc COPYING COPYING.GPLv2 COPYING.UBDL -%files roms -f rom.list -%dir %{_datadir}/%{name} -%doc COPYING COPYING.GPLv2 COPYING.UBDL - %files roms-qemu -f qemu.rom.list %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}.efi @@ -271,13 +226,14 @@ cp -a src/bin-arm64-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/arm64-efi/ipxe %files bootimgs-aarch64 %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/arm64-efi -%if 0%{?fedora} -%{_datadir}/%{name}/arm64-efi/ipxe.efi -%endif %{_datadir}/%{name}/arm64-efi/snponly.efi %endif %changelog +* Tue Jul 16 2024 Gerd Hoffmann - 20240119-4.gitde8a0821 +- Strip down package, remove drivers except qemu drivers. +- Resolves: RHEL-37610 + * Mon Jun 24 2024 Troy Dawson - 20240119-3.gitde8a0821 - Bump release for June 2024 mass rebuild