From 87ee25a741b02b83241c9d27e553163cf4d52318 Mon Sep 17 00:00:00 2001
From: deadwood <deadwood@wp.pl>
Date: Thu, 18 Sep 2025 15:37:05 +0200
Subject: [PATCH] Place either _unicode or unicode in /fonts depending on
 bootloader selection

This removed duplicated file from root grub director and makes the
gfx/text bootloader selection work again in InstallAROS.
---
 arch/all-pc/boot/grub2-host/mmakefile.src | 21 ++++++++++++---------
 arch/i386-pc/boot/grub2/mmakefile.src     |  4 ++--
 arch/x86_64-pc/boot/grub2/mmakefile       |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/arch/all-pc/boot/grub2-host/mmakefile.src b/arch/all-pc/boot/grub2-host/mmakefile.src
index dbfa7e49a5..fd9254f47f 100644
--- a/arch/all-pc/boot/grub2-host/mmakefile.src
+++ b/arch/all-pc/boot/grub2-host/mmakefile.src
@@ -70,22 +70,19 @@ $(DESTDIR)/share/grub:
 	%mkdirs_q $@
 
 #MM
-bootloader-grub2gfx-common: $(BOOT_GRUB)/splash.png $(BOOT_GRUB)/_unicode.pf2 $(BOOT_EFI)/splash.png $(BOOT_EFI)/_unicode.pf2
+bootloader-grub2gfx-common: $(BOOT_GRUB)/splash.png $(BOOT_EFI)/splash.png
 
 $(BOOT_GRUB)/splash.png: $(SPLASHIMAGE) | $(BOOT_GRUB)
 		$(CP) $< $@
 
-$(BOOT_GRUB)/_unicode.pf2: unicode.pf2 | $(BOOT_GRUB)
-		$(CP) $< $(BOOT_GRUB)/_unicode.pf2
-
 $(BOOT_EFI)/splash.png: $(SPLASHIMAGE) | $(BOOT_EFI)
 		$(CP) $< $@
 
-$(BOOT_EFI)/_unicode.pf2: unicode.pf2 | $(BOOT_EFI)
-		$(CP) $< $(BOOT_EFI)/_unicode.pf2
+$(DESTDIR)/share/grub/unicode.pf2: unicode.pf2 | $(DESTDIR)/share/grub
+		$(CP) $< $@
 
 #MM
-bootloader-grub2gfx-common-livecd: $(BOOT_GRUB)/fonts/unicode.pf2 $(BOOT_EFI)/fonts/unicode.pf2
+bootloader-grub2gfx-gfxmode: $(BOOT_GRUB)/fonts/unicode.pf2 $(BOOT_EFI)/fonts/unicode.pf2
 
 $(BOOT_GRUB)/fonts/unicode.pf2: unicode.pf2 $(BOOT_GRUB)/fonts
 		$(CP) $< $(BOOT_GRUB)/fonts
@@ -93,8 +90,14 @@ $(BOOT_GRUB)/fonts/unicode.pf2: unicode.pf2 $(BOOT_GRUB)/fonts
 $(BOOT_EFI)/fonts/unicode.pf2: unicode.pf2 $(BOOT_EFI)/fonts
 		$(CP) $< $(BOOT_EFI)/fonts
 
-$(DESTDIR)/share/grub/unicode.pf2: unicode.pf2 | $(DESTDIR)/share/grub
-		$(CP) $< $@
+#MM
+bootloader-grub2gfx-txtmode: $(BOOT_GRUB)/fonts/_unicode.pf2 $(BOOT_EFI)/fonts/_unicode.pf2
+
+$(BOOT_GRUB)/fonts/_unicode.pf2: unicode.pf2 $(BOOT_GRUB)/fonts
+		$(CP) $< $(BOOT_GRUB)/fonts
+
+$(BOOT_EFI)/fonts/_unicode.pf2: unicode.pf2 $(BOOT_EFI)/fonts
+		$(CP) $< $(BOOT_EFI)/fonts
 
 # avoid the make.tmpl s_flag in order to disable stripping of binaries
 export DEBUG		    := yes
diff --git a/arch/i386-pc/boot/grub2/mmakefile.src b/arch/i386-pc/boot/grub2/mmakefile.src
index a85fc7c3cc..a684e7ccb2 100644
--- a/arch/i386-pc/boot/grub2/mmakefile.src
+++ b/arch/i386-pc/boot/grub2/mmakefile.src
@@ -1,8 +1,8 @@
 
 include $(SRCDIR)/config/aros.cfg
 
-#MM bootloader-grub2-pc-i386 : grub2-dirs bootloader-grub2gfx-common grub2-pc-i386
-#MM bootloader-grub2gfx-pc-i386 : grub2-dirs bootloader-grub2gfx-common bootloader-grub2gfx-common-livecd grub2-pc-i386
+#MM bootloader-grub2-pc-i386 : grub2-dirs bootloader-grub2gfx-common bootloader-grub2gfx-txtmode grub2-pc-i386
+#MM bootloader-grub2gfx-pc-i386 : grub2-dirs bootloader-grub2gfx-common bootloader-grub2gfx-gfxmode grub2-pc-i386
 
 #MM- grub2-pc-i386: arch-common-grub2 grub2-iso-setup
 
diff --git a/arch/x86_64-pc/boot/grub2/mmakefile b/arch/x86_64-pc/boot/grub2/mmakefile
index edd5b401dd..d6aebacadc 100644
--- a/arch/x86_64-pc/boot/grub2/mmakefile
+++ b/arch/x86_64-pc/boot/grub2/mmakefile
@@ -2,9 +2,9 @@
 include $(SRCDIR)/config/aros.cfg
 
 #MM- bootloader-grub2-pc-x86_64-quick : bootloader-grub2-pc-x86_64
-#MM bootloader-grub2-pc-x86_64 : grub2-dirs bootloader-grub2gfx-common grub2-pc-x86_64
+#MM bootloader-grub2-pc-x86_64 : grub2-dirs bootloader-grub2gfx-common bootloader-grub2gfx-txtmode grub2-pc-x86_64
 #MM- bootloader-grub2gfx-pc-x86_64-quick : bootloader-grub2gfx-pc-x86_64
-#MM bootloader-grub2gfx-pc-x86_64 : grub2-dirs bootloader-grub2gfx-common bootloader-grub2gfx-common-livecd grub2-pc-x86_64
+#MM bootloader-grub2gfx-pc-x86_64 : grub2-dirs bootloader-grub2gfx-common bootloader-grub2gfx-gfxmode grub2-pc-x86_64
 
 #MM- grub2-pc-x86_64: arch-common-grub2 grub2-iso-setup