From e4f720513836adedf7883320167c690a83823c47 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 11 Nov 2024 18:59:37 +0300 Subject: [PATCH] Bundle unicode.pf2 with images --- SOURCES/grub.macros | 6 ++++++ SPECS/grub2.spec | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros index 966c079..6b9bb42 100755 --- a/SOURCES/grub.macros +++ b/SOURCES/grub.macros @@ -389,13 +389,19 @@ rm -f %{1}.conf \ %ifarch x86_64 aarch64 %{arm} riscv64 %define efi_mkimage() \ +%define efi_mkimage() \ +mkdir -p memdisk/fonts \ +cp %{4}/unicode.pf2 memdisk/fonts \ +mksquashfs memdisk memdisk.squashfs -comp xz \ %{4}./grub-mkimage -O %{1} -o %{2}.orig \\\ -p /EFI/%{efi_vendor} -d grub-core \\\ --sbat %{4}./sbat.csv \\\ + -m memdisk.squashfs \\\ ${GRUB_MODULES} \ %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ -p /EFI/BOOT -d grub-core \\\ --sbat %{4}./sbat.csv \\\ + -m memdisk.squashfs \\\ ${GRUB_MODULES} \ %{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \ %{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 9f72e03..b7d44d1 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -19,7 +19,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 92%{?dist}.inferit.1 +Release: 92%{?dist}.inferit.3 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -537,6 +537,12 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Mon Nov 11 2024 Arkady L. Shane - 1:2.06-92.inferit.3 +- Bundle unicode.pf2 with images + +* Mon Nov 11 2024 Arkady L. Shane - 1:2.06-92.inferit.2 +- Try to use font from MSVSphere 8 to avoid bad symbols in EFI mode + * Fri Nov 01 2024 Arkady L. Shane - 2.06-92.inferit.1 - Bump release to rebuild