From fe0248c0cef1e8ef5e41790c5906f3dd691308d9 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Fri, 25 Feb 2022 22:25:36 +0000 Subject: [PATCH] Fix stripping of annobin -spec Signed-off-by: Robbie Harwood --- grub.macros | 6 +++--- grub2.spec | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/grub.macros b/grub.macros index a198b17..3824779 100644 --- a/grub.macros +++ b/grub.macros @@ -20,8 +20,8 @@ %global cflags_sed \\\ sed \\\ -e 's/-O. //g' \\\ - -e 's/-fplugin=annobin //g' \\\ - -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]* ,,g' \\\ + -e 's/-fplugin=annobin//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' \\\ @@ -52,7 +52,7 @@ %global ldflags_sed \\\ sed \\\ - -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]* ,,g' \\\ + -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]*,,g' \\\ -e 's/^$//' \\\ %{nil} diff --git a/grub2.spec b/grub2.spec index 884226c..b8d2608 100644 --- a/grub2.spec +++ b/grub2.spec @@ -525,6 +525,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Fri Feb 25 2022 Robbie Harwood - 2.06-19 +- Fix stripping of annobin -spec + * Thu Feb 24 2022 Robbie Harwood - 2.06-18 - Add efidisk/connectefi patches