rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix stripping of annobin -spec

Browse Source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-02-25 22:25:36 +00:00
parent e82a4fd034
commit fe0248c0ce
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub.macros
View File

@ -20,8 +20,8 @@
%global cflags_sed \\\ %global cflags_sed \\\
sed \\\ sed \\\
-e 's/-O. //g' \\\ -e 's/-O. //g' \\\
-e 's/-fplugin=annobin //g' \\\ -e 's/-fplugin=annobin//g' \\\
-e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]* ,,g' \\\ -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]*,,g' \\\
-e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\ -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\
-e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\ -e 's/-Wp,-D_FORTIFY_SOURCE=[[:digit:]]\\+//g' \\\
-e 's/--param=ssp-buffer-size=4//g' \\\ -e 's/--param=ssp-buffer-size=4//g' \\\
@ -52,7 +52,7 @@
%global ldflags_sed \\\ %global ldflags_sed \\\
sed \\\ sed \\\
-e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]* ,,g' \\\ -e 's,-specs=[[:alnum:]/_-]*annobin[[:alnum:]_-]*,,g' \\\
-e 's/^$//' \\\ -e 's/^$//' \\\
%{nil} %{nil}

3
grub2.spec
View File

@ -525,6 +525,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Fri Feb 25 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-19
- Fix stripping of annobin -spec
* Thu Feb 24 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-18 * Thu Feb 24 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-18
- Add efidisk/connectefi patches - Add efidisk/connectefi patches