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

Attempt to fix eln build

Browse Source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-12-19 18:55:40 +00:00
parent fa48146e4c
commit 55921d8655
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
grub.macros
View File

@ -436,10 +436,18 @@ mksquashfs memdisk memdisk.squashfs -comp xz \
%endif
%ifarch ppc64le
%if 0%{?rhel}
# RHEL signs, Fedora + ELN don't (but ELN defines rhel)
%if 0%{?fedora} || 0%{?eln}
%define ieee1275_mkimage() \
mkdir -p memdisk/fonts \
cp %{4}/unicode.pf2 memdisk/fonts \
cp %{5}/unicode.pf2 memdisk/fonts \
mksquashfs memdisk memdisk.squashfs -comp xz \
./grub-mkimage -O %{1} -o %{2} -p '/grub2' -d grub-core ${GRUB_MODULES} \
%{nil}
%else
%define ieee1275_mkimage() \
mkdir -p memdisk/fonts \
cp %{5}/unicode.pf2 memdisk/fonts \
mksquashfs memdisk memdisk.squashfs -comp xz \
APPENDED_SIG_SIZE=0 \
if [ -x /usr/bin/rpm-sign ]; then \
@ -466,12 +474,6 @@ else \
mv %{2}.orig %{2} \
fi \
%{nil}
%else
# Fedora et al.
%define ieee1275_mkimage() \
./grub-mkimage -O %{1} -o %{2}.orig -p '/grub2' -d grub-core ${GRUB_MODULES} \
mv %{2}.orig %{2}
%{nil}
%endif
%endif
@ -486,7 +488,7 @@ GRUB_MODULES+=%{platform_modules} \
GRUB_MODULES+=%{grub_modules} \
GRUB_MODULES+=%{platform_modules} \
cd grub-%{1}-%{tarversion} \
%{expand:%%ieee1275_mkimage %%{1} %%{2} %%{3} %%{4}} \
%{expand:%%ieee1275_mkimage %%{1} %%{2} %%{3} %%{4} ./ }\
cd .. \
%{nil}

5
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 70%{?dist}
Release: 71%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -544,6 +544,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Mon Dec 19 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-71
- Attempt to fix eln build
* Wed Dec 14 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-70
- ppc64le: fix lpar cas5
- Resolves: #2152547