github/AROS-v0
1
0
Fork 0
mirror of https://github.com/deadw00d/AROS.git synced 2026-03-17 07:41:59 +00:00
Code Issues Releases Wiki Activity

Place either _unicode or unicode in /fonts depending on bootloader selection

Browse Source 
This removed duplicated file from root grub director and makes the
gfx/text bootloader selection work again in InstallAROS.
This commit is contained in:
deadwood
2025-09-18 15:37:05 +02:00
parent c7ca1a2e6e
commit 87ee25a741
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/all-pc/boot/grub2-host/mmakefile.src
View File

@ -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

4
arch/i386-pc/boot/grub2/mmakefile.src
View File

@ -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

4
arch/x86_64-pc/boot/grub2/mmakefile
View File

@ -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