From f7e28964acdce46e9b9e4afeece5b228b7163a3c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 17 Jun 2024 15:30:40 +0100 Subject: roms: remind the user about gkb files nowadays, we don't insert GRUB keymaps automatically, for sake of efficiency; without one, the default is US QWERTY. a user will only want one keymap in particular, so this is more efficient. in practise, they're either building from source anyway, or using the inject scripts which compile cbfstool anyway, so the user will already have cbfstool. also output this message from the inject script. Signed-off-by: Leah Rowe --- include/lib.sh | 2 ++ include/vendor.sh | 3 ++- script/roms | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/lib.sh b/include/lib.sh index 9f722313..5952b202 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -7,6 +7,8 @@ export LC_COLLATE=C export LC_ALL=C _ua="Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0" +kbnotice="Insert a .gkb file from config/data/grub/keymap/ as keymap.gkb \ +if you want a custom keymap in GRUB; use cbfstool from elf/cbfstool." tmpdir_was_set="y" cbdir="src/coreboot/default" diff --git a/include/vendor.sh b/include/vendor.sh index b5fda8f3..54dac191 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -261,7 +261,8 @@ vendor_inject() inject_vendorfiles [ "$nukemode" = "nuke" ] && return 0 printf "Friendly reminder (this is *not* an error message):\n" - printf "Please ensure that the files were inserted correctly.\n" + printf "Please ensure that the files were inserted correctly. ALSO:\n" + printf "%s\n" "$kbnotice" } check_board() diff --git a/script/roms b/script/roms index 3412b150..3791535e 100755 --- a/script/roms +++ b/script/roms @@ -43,9 +43,10 @@ main() && targets="$targets, $x"; continue done - [ -z "$targets" ] && $err "No ROM images were compiled" +# [ -z "$targets" ] && $err "No ROM images were compiled" printf "Check these ROM directories in bin/: %s\n" "${targets#, }" - printf "DO NOT flash images from elf/ - please use bin/ instead.\n" + printf "DO NOT flash images from elf/ - use bin/ instead. ALSO:\n" + printf "%s\n" "$kbnotice" } mkserprog() -- cgit v1.2.1