rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-12-01 00:48:18 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Update our gcc nerfing.

Browse source 
- Only nerf annobin, not -fstack-crash-protection.
- Fix a conflict on /boot/efi directory permissions between -cdboot and the
  normal bootloader.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-01-19 13:16:55 -05:00
parent 28076bb004
commit d51395ea7f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub.macros
View file

@ -18,7 +18,6 @@
sed \\\ sed \\\
-e 's/-O. //g' \\\ -e 's/-O. //g' \\\
-e 's/-g /-g3 /g' \\\ -e 's/-g /-g3 /g' \\\
-e 's/-fstack-clash-protection //g' \\\
-e 's/-fplugin=annobin //g' \\\ -e 's/-fplugin=annobin //g' \\\
-e 's,-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ,,g' \\\ -e 's,-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ,,g' \\\
-e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\ -e 's/-fstack-protector[[:alpha:]-]\\+//g' \\\
@ -28,7 +27,6 @@
-e 's/-fexceptions//g' \\\ -e 's/-fexceptions//g' \\\
-e 's/-fasynchronous-unwind-tables//g' \\\ -e 's/-fasynchronous-unwind-tables//g' \\\
-e 's/^/ -fno-strict-aliasing /' \\\ -e 's/^/ -fno-strict-aliasing /' \\\
-e 's/^/ -fno-stack-clash-protection /' \\\
%{nil} %{nil}
%global efi_cflags \\\ %global efi_cflags \\\
@ -494,7 +492,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \
%config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \ %config(noreplace) %{_sysconfdir}/%{name}-efi.cfg \
%dir %attr(0700,root,root)/boot/efi/EFI/%{efidir} \ %dir %attr(0700,root,root)/boot/efi/EFI/%{efidir} \
%attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{2} \ %attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{2} \
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \ %attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \
%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grub.cfg \ %ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grub.cfg \
/boot/grub2/grubenv \ /boot/grub2/grubenv \
%ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \ %ghost %config(noreplace) %attr(0700,root,root)/boot/efi/EFI/%{efidir}/grubenv \

7
grub2.spec
View file

@ -7,7 +7,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
Release: 22%{?dist} Release: 23%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+
@ -454,6 +454,11 @@ fi
%endif %endif
%changelog %changelog
* Fri Jan 19 2018 Peter Jones <pjones@redhat.com> - 2.02-23
- Only nerf annobin, not -fstack-crash-protection.
- Fix a conflict on /boot/efi directory permissions between -cdboot and the
normal bootloader.
* Thu Jan 18 2018 Peter Jones <pjones@redhat.com> - 2.02-22 * Thu Jan 18 2018 Peter Jones <pjones@redhat.com> - 2.02-22
- Nerf some gcc 7.2.1-6 'features' that cause grub to crash on start. - Nerf some gcc 7.2.1-6 'features' that cause grub to crash on start.