diff --git a/1001-ipxe-gcc10.patch b/1001-ipxe-gcc10.patch deleted file mode 100644 index 9df561f67badecdb163cebca00a63e2fa8a187d0..0000000000000000000000000000000000000000 --- a/1001-ipxe-gcc10.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f982a712979619dbae2c6e0d741757e2ce94be11 Mon Sep 17 00:00:00 2001 -From: Bruce Rogers -Date: Wed, 6 May 2020 15:03:02 -0600 -Subject: [PATCH] [build] Be explicit about -fcommon compiler directive - -gcc10 switched default behavior from -fcommon to -fno-common. Since -"__shared" relies on the legacy behavior, explicitly specify it. - -Signed-off-by: Bruce Rogers -Modified-by: Michael Brown -Signed-off-by: Michael Brown ---- - src/Makefile.housekeeping | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping -index 66d6dd449..b6c61c112 100644 ---- a/src/Makefile.housekeeping -+++ b/src/Makefile.housekeeping -@@ -418,6 +418,7 @@ CFLAGS += -Os - CFLAGS += -g - ifeq ($(CCTYPE),gcc) - CFLAGS += -ffreestanding -+CFLAGS += -fcommon - CFLAGS += -Wall -W -Wformat-nonliteral - HOST_CFLAGS += -Wall -W -Wformat-nonliteral - endif diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/ipxe.spec b/ipxe.spec index c10be1da55037e5fddca6c9c2402e8253816fc94..366167dabf19724fe53393a07ccb669f6110e5ae 100644 --- a/ipxe.spec +++ b/ipxe.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Resulting binary formats we want from iPXE %global formats rom @@ -39,7 +38,7 @@ Name: ipxe Version: %{date} -Release: 9.git%{hash}%{anolis_release}%{?dist} +Release: 11.git%{hash}%{?dist} Summary: A network boot loader Group: System Environment/Base @@ -59,10 +58,6 @@ Patch0005: 0001-efi-perform-cable-detection-at-NII-initialization-on-HPE-557SFP. Patch0006: ipxe-ping-cmd.patch Patch0007: 0001-arm-Provide-dummy-implementation-for-in-out-s-b-w-l.patch -# Begin: Anolis customized patches -Patch1001: 1001-ipxe-gcc10.patch -# End: Anolis customized patches - %ifarch %{buildarches} BuildRequires: perl-interpreter BuildRequires: perl-Getopt-Long @@ -299,8 +294,11 @@ cp -a src/bin-arm64-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/arm64-efi/ipxe %endif %changelog -* Mon May 16 2022 liuxiaoping - 20181214-9.git133f4c47.0.1 -- Fix gcc10 -fno-common compile issue for compatible with gcc10 build (geliwei@openanolis.org) +* Thu Sep 29 2022 Jarod Wilson - 20181214-11.git133f4c47 +- Revert LACP flood issue fix due to regressions is causes elsewhere + +* Wed Jul 27 2022 Jarod Wilson - 20181214-10.git133f4c47 +- Fix LACP flood issue in ipxe-bootimgs (bz 2098761) * Tue Mar 01 2022 Yaakov Selkowitz - 20181214-9.git133f4c47 - Add ARM 64 EFI artifacts (bz 2059350)