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

Add the right certificate macros for CentOS Stream and RHEL

Browse Source 
Relates: RHEL-25958

Signed-off-by: Brian Stinson <bstinson@redhat.com>
This commit is contained in:
Brian Stinson 2024-02-20 20:44:11 -06:00
parent 29406ad333
commit 41b6d9cafa
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.macros
View File

@ -396,7 +396,7 @@ install -m 644 %{1}.conf ${RPM_BUILD_ROOT}/etc/dnf/protected.d/ \
rm -f %{1}.conf \ rm -f %{1}.conf \
%{nil} %{nil}
%global grub_modules " all_video boot blscfg btrfs \\\ %global grub_modules " all_video boot blscfg \\\
cat configfile cryptodisk \\\ cat configfile cryptodisk \\\
echo ext2 f2fs fat font \\\ echo ext2 f2fs fat font \\\
gcry_rijndael gcry_rsa gcry_serpent \\\ gcry_rijndael gcry_rsa gcry_serpent \\\

21
grub2.spec
View File

@ -38,6 +38,25 @@ Source12: sbat.csv.in
%include %{SOURCE1} %include %{SOURCE1}
%ifarch x86_64 aarch64 ppc64le
%define sb_ca %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer
%define sb_cer %{_datadir}/pki/sb-certs/secureboot-grub2-%{_arch}.cer
%endif
%if 0%{?centos}
%ifarch x86_64 aarch64 ppc64le
%define sb_key centossecureboot202
%endif
%else
%ifarch x86_64 aarch64
%define sb_key redhatsecureboot502
%endif
%ifarch ppc64le
%define sb_key redhatsecureboot702
%endif
%endif
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: binutils BuildRequires: binutils
@ -68,7 +87,7 @@ BuildRequires: systemd-rpm-macros
%ifarch %{efi_arch} %ifarch %{efi_arch}
BuildRequires: pesign >= 0.99-8 BuildRequires: pesign >= 0.99-8
%endif %endif
BuildRequires: system-sb-certs
%if %{?_with_ccache: 1}%{?!_with_ccache: 0} %if %{?_with_ccache: 1}%{?!_with_ccache: 0}
BuildRequires: ccache BuildRequires: ccache
%endif %endif