From db96a0c4de542d3191542d3f5c6ca560d39a50d3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 24 Aug 2021 12:14:06 -0400 Subject: [PATCH] grub.macros: Remove annobin plugin from linker flags The annobin GCC plugin is now turned on linking for LTO mode but it causes build failures on at least powerpc. The plugin is already removed from the CFLAGS but was added again through LDFLAGS, remove from there as well. Signed-off-by: Peter Jones --- grub.macros | 3 ++- grub2.spec | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/grub.macros b/grub.macros index 865ade3..5863037 100644 --- a/grub.macros +++ b/grub.macros @@ -18,7 +18,7 @@ sed \\\ -e 's/-O. //g' \\\ -e 's/-fplugin=annobin //g' \\\ - -e 's,-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ,,g' \\\ + -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]* ,,g' \\\ -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\ -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\ -e 's/--param=ssp-buffer-size=4//g' \\\ @@ -49,6 +49,7 @@ %global ldflags_sed \\\ sed \\\ + -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]* ,,g' \\\ -e 's/^$//' \\\ %{nil} diff --git a/grub2.spec b/grub2.spec index 907cae8..6c82b03 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -523,6 +523,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Tue Aug 24 2021 Peter Jones - 2.06-4 +- Fix aarch64 kernel alignment. +- Fix annobin regexp on ppc64le + * Tue Jul 06 2021 Javier Martinez Canillas - 2.06-3 - Add luks2 to GRUB_MODULES - 20-grub-install: Create a symvers.gz symbolic link