ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 21:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

grub2: add small default font

Browse Source 
Issue #4741
This commit is contained in:
Alexander Boettcher 2023-01-25 14:02:16 +01:00 committed by Christian Helmuth
parent 84c5a7b0cd
commit 93e26cae35
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base/ports/grub2.hash
View File

@ -1 +1 @@
aae6a9ce3485b9fe5c589817e4cfc80b199d8e11 80d41dfe8a1d8d8a80c51f446553b7d28c3ce395

3
repos/base/ports/grub2.port
View File

@ -3,9 +3,10 @@ VERSION := git
DOWNLOADS := g2fg.git DOWNLOADS := g2fg.git
URL(g2fg) := https://github.com/alex-ab/g2fg.git URL(g2fg) := https://github.com/alex-ab/g2fg.git
REV(g2fg) := 7fb21d87623a3e511ec755d9a4024e16728937be REV(g2fg) := 0d94ee016a3a4f991f502d04ef59e7d0d8e75346
DIR(g2fg) := boot DIR(g2fg) := boot
default: $(DOWNLOADS) default: $(DOWNLOADS)
$(VERBOSE)tar -C boot -xJf boot/grub2.tar.xz $(VERBOSE)tar -C boot -xJf boot/grub2.tar.xz
$(VERBOSE)unxz -kf boot/grub2-head.img.xz $(VERBOSE)unxz -kf boot/grub2-head.img.xz
$(VERBOSE)unxz -kf boot/font.pf2.xz

22
tool/run/boot_dir/nova
View File

@ -110,12 +110,9 @@ proc run_boot_dir {binaries} {
if {[have_include "image/disk"]} { if {[have_include "image/disk"]} {
exec mkdir -p [run_dir]/boot/grub exec mkdir -p [run_dir]/boot/grub
exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
exec cp [genode_dir]/tool/boot/boot.png [run_dir]/boot/boot.png exec cp [genode_dir]/tool/boot/boot.png [run_dir]/boot/boot.png
if {[file exists /boot/grub/unicode.pf2]} { exec cp [get_grub2_dir]/boot/font.pf2 [run_dir]/boot/font.pf2
# needed in graphical menu with non-scrampled characters
# exec cp /boot/grub/unicode.pf2 [run_dir]/boot/grub/unicode.pf2
}
} }
if {[have_include "image/iso"]} { if {[have_include "image/iso"]} {
@ -123,19 +120,14 @@ proc run_boot_dir {binaries} {
} }
if {[have_include image/uefi]} { if {[have_include image/uefi]} {
set grub2_path [get_grub2_dir]
exec mkdir -p [run_dir]/efi/boot exec mkdir -p [run_dir]/efi/boot
exec cp $grub2_path/boot/grub2/grub2_32.efi [run_dir]/efi/boot/bootia32.efi exec cp [get_grub2_dir]/boot/grub2/grub2_32.efi [run_dir]/efi/boot/bootia32.efi
exec cp $grub2_path/boot/grub2/grub2_64.efi [run_dir]/efi/boot/bootx64.efi exec cp [get_grub2_dir]/boot/grub2/grub2_64.efi [run_dir]/efi/boot/bootx64.efi
exec mkdir -p [run_dir]/boot/grub exec mkdir -p [run_dir]/boot/grub
exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
exec cp [genode_dir]/tool/boot/boot.png [run_dir]/boot/boot.png exec cp [genode_dir]/tool/boot/boot.png [run_dir]/boot/boot.png
if {[file exists /boot/grub/unicode.pf2]} { exec cp [get_grub2_dir]/boot/font.pf2 [run_dir]/boot/font.pf2
# needed in graphical menu with non-scrampled characters
# exec cp /boot/grub/unicode.pf2 [run_dir]/boot/grub/unicode.pf2
}
append options_bender " serial_fallback" append options_bender " serial_fallback"
} }
@ -145,8 +137,8 @@ proc run_boot_dir {binaries} {
# #
set fh [open "[run_dir]/boot/grub/grub.cfg" "WRONLY CREAT TRUNC"] set fh [open "[run_dir]/boot/grub/grub.cfg" "WRONLY CREAT TRUNC"]
# If timeout != 0 is used and gfxterm, enable and add unicode.pf2 (see above) # If timeout != 0 is used a font is required in graphic mode
# puts $fh "loadfont /boot/grub/unicode.pf2" puts $fh "loadfont /boot/font.pf2"
puts $fh "set timeout=0" puts $fh "set timeout=0"
# choose best graphic mode # choose best graphic mode

1
tool/run/iso.inc
View File

@ -20,4 +20,5 @@ proc install_iso_bootloader_to_run_dir { } {
} }
exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
exec cp $grub2_path/boot/font.pf2 [run_dir]/boot/font.pf2
} }