Bundle unicode.pf2 with images

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}}} \

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 <tigro@msvsphere-os.ru> - 1:2.06-92.inferit.3
+- Bundle unicode.pf2 with images
+
+* Mon Nov 11 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 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 <tigro@msvsphere-os.ru> - 2.06-92.inferit.1
 - Bump release to rebuild