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

Attempt to fix ppc64le signing bugs in previous change

Browse Source 
Resolves: #2049214
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-02-16 19:05:03 +00:00
parent c4d20133ef
commit 2ab799de70
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
grub.macros Normal file → Executable file
View File

@ -435,7 +435,7 @@ rm -f %{1}.conf \
APPENDED_SIG_SIZE=0 \ APPENDED_SIG_SIZE=0 \
if [ -x /usr/bin/rpm-sign ]; then \ if [ -x /usr/bin/rpm-sign ]; then \
touch empty.unsigned \ touch empty.unsigned \
rpm-sign --key %{5} \\\ rpm-sign --key %{4} \\\
--lkmsign empty.unsigned \\\ --lkmsign empty.unsigned \\\
--output empty.signed \ --output empty.signed \
APPENDED_SIG_SIZE="$(stat -c '%s' empty.signed)" \ APPENDED_SIG_SIZE="$(stat -c '%s' empty.signed)" \
@ -444,12 +444,12 @@ fi \
# FIXME: using this prefix is fragile, must be done properly \ # FIXME: using this prefix is fragile, must be done properly \
./grub-mkimage -O %{1} -o %{2}.orig \\\ ./grub-mkimage -O %{1} -o %{2}.orig \\\
-p '/grub2' -d grub-core \\\ -p '/grub2' -d grub-core \\\
-x %{3} -x %{4} \\\ -x %{3} \\\
--appended-signature-size ${APPENDED_SIG_SIZE} \\\ --appended-signature-size ${APPENDED_SIG_SIZE} \\\
${GRUB_MODULES} \ ${GRUB_MODULES} \
if [ -x /usr/bin/rpm-sign ]; then \ if [ -x /usr/bin/rpm-sign ]; then \
truncate -s -${APPENDED_SIG_SIZE} %{2}.orig \ truncate -s -${APPENDED_SIG_SIZE} %{2}.orig \
rpm-sign --key %{5} \\\ rpm-sign --key %{4} \\\
--lkmsign %{2}.orig \\\ --lkmsign %{2}.orig \\\
--output %{2} \ --output %{2} \
else \ else \
@ -469,7 +469,7 @@ GRUB_MODULES+=%{platform_modules} \
GRUB_MODULES+=%{grub_modules} \ GRUB_MODULES+=%{grub_modules} \
GRUB_MODULES+=%{platform_modules} \ GRUB_MODULES+=%{platform_modules} \
cd grub-%{1}-%{tarversion} \ cd grub-%{1}-%{tarversion} \
%{expand:%%ieee1275_mkimage %%{1} %%{2} %%{3} %%{4} %%{5}} \ %{expand:%%ieee1275_mkimage %%{1} %%{2} %%{3} %%{4}} \
cd .. \ cd .. \
%{nil} %{nil}

6
grub2.spec
View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 18%{?dist} Release: 19%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -539,6 +539,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Wed Feb 16 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-19
- Attempt to fix ppc64le signing bugs in previous change
- Resolves: #2049214
* Wed Feb 16 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-18 * Wed Feb 16 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-18
- Switch to single-signing and use certs from package (bstinson) - Switch to single-signing and use certs from package (bstinson)
- Resolves: #2049214 - Resolves: #2049214