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

aarch64/macros: Re-added flags that disappeared with previous commit

Browse Source 
Related: #RHEL-58821
Signed-off-by: Nicolas Frayer <nfrayer@redhat.com>
This commit is contained in:
Nicolas Frayer 2024-09-18 17:56:57 +02:00
parent c69e56f2af
commit 008b689173
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub.macros
View File

@ -17,9 +17,9 @@
# gnulib actively ignores CFLAGS because it's terrible # gnulib actively ignores CFLAGS because it's terrible
# build aarch64 gnulib with branch protection # build aarch64 gnulib with branch protection
%ifarch aarch64 %ifarch aarch64
%global cc_equals "CC=%{ccpath} -fPIE -Wl,-z,noexecstack -mbranch-protection=standard" %global cc_equals "CC=%{ccpath} -fPIE -Wl,-z,noexecstack -Wl,--no-warn-rwx-segments -mbranch-protection=standard"
%else %else
%global cc_equals "CC=%{ccpath} -fPIE -Wl,-z,noexecstack" %global cc_equals "CC=%{ccpath} -fPIE -Wl,-z,noexecstack -Wl,--no-warn-rwx-segments"
%endif %endif
%global cflags_sed \\\ %global cflags_sed \\\

6
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 129%{?dist} Release: 130%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPL-3.0-or-later License: GPL-3.0-or-later
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -582,6 +582,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Wed Sep 18 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-130
- aarch64/macros: Re-added flags that disappeared with previous commit
- Related: #RHEL-58821
* Thu Sep 12 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-129 * Thu Sep 12 2024 Nicolas Frayer <nfrayer@redhat.com> - 2.06-129
- aarch64/macros: Build gnulib with -mbranch-protection=standard - aarch64/macros: Build gnulib with -mbranch-protection=standard
- Resolves: #RHEL-58821 - Resolves: #RHEL-58821