From d0555d82c83ed41e4e22259bc96dad329610761e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 18 2021 06:59:43 +0000
Subject: import ipxe-20181214-8.git133f4c47.el8


---

diff --git a/SOURCES/ipxe-ping-cmd.patch b/SOURCES/ipxe-ping-cmd.patch
new file mode 100644
index 0000000..edbcbef
--- /dev/null
+++ b/SOURCES/ipxe-ping-cmd.patch
@@ -0,0 +1,11 @@
+--- ./src/config/general.h.orig	2021-01-26 19:47:08.940559209 -0500
++++ ./src/config/general.h	2021-01-26 19:47:15.739526567 -0500
+@@ -148,7 +148,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+ //#define PCI_CMD		/* PCI commands */
+ //#define PARAM_CMD		/* Form parameter commands */
+ //#define NEIGHBOUR_CMD		/* Neighbour management commands */
+-//#define PING_CMD		/* Ping command */
++#define PING_CMD		/* Ping command */
+ //#define CONSOLE_CMD		/* Console command */
+ //#define IPSTAT_CMD		/* IP statistics commands */
+ //#define PROFSTAT_CMD		/* Profiling commands */
diff --git a/SPECS/ipxe.spec b/SPECS/ipxe.spec
index 0389776..72671c4 100644
--- a/SPECS/ipxe.spec
+++ b/SPECS/ipxe.spec
@@ -49,7 +49,7 @@
 
 Name:    ipxe
 Version: %{date}
-Release: 6.git%{hash}%{?dist}
+Release: 8.git%{hash}%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -66,6 +66,7 @@ Patch0002: 0002-Use-spec-compliant-timeouts.patch
 Patch0003: 0003-Strip-802.1Q-VLAN-0-priority-tags.patch
 Patch0004: ipxe-vlan-cmds.patch
 Patch0005: 0001-efi-perform-cable-detection-at-NII-initialization-on-HPE-557SFP.patch
+Patch0006: ipxe-ping-cmd.patch
 
 %ifarch %{buildarches}
 BuildRequires: perl-interpreter
@@ -183,9 +184,12 @@ for rom in %{qemuroms}; do
   vid="0x${rom%%????}"
   did="0x${rom#????}"
   EfiRom -f "$vid" -i "$did" --pci23 \
-         -b  bin/${rom}.rom \
          -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
@@ -260,6 +264,12 @@ done
 %endif
 
 %changelog
+* Fri Feb 19 2021 Jarod Wilson <jarod@redhat.com> - 20181210-8.git133f4c47
+- combine BIOS and EFI roms using utils/catrom.pl [lersek] (bz 1926561)
+
+* Tue Jan 26 2021 Jarod Wilson <jarod@redhat.com> - 20181210-7.git133f4c47
+- Build ping command (bz 1913719)
+
 * Mon Jul 27 2020 Neil Horman <nhorman@redhat.com> - 20181210-6.git133f4c47
 - Add quirk for link detect on HP 557SFP cards (bz 1740827)