diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-05-05 17:41:10 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-05-05 17:48:57 +0100 |
| commit | 89a8cd4936a7dd24eb4c2db8a484b858ed20dd88 (patch) | |
| tree | cfd4f7c165a3d3f8268c7dd4fb215c9167e7285f | |
| parent | c2182d821939a7d3c3e8ff2b6ff96e9e44ff96fa (diff) | |
rom.sh: simplify mkseagrub()
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/rom.sh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/rom.sh b/include/rom.sh index af739d92..8f605e3a 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -192,9 +192,7 @@ mkseagrub() [ "$payload_grubsea" = "y" ] && pname="grub" [ "$payload_grubsea" = "y" ] || \ cbfs "$tmprom" "$grubdata/bootorder" bootorder raw - for keymap in config/data/grub/keymap/*.gkb; do - [ -f "$keymap" ] && cprom "${keymap##*/}"; : - done; : + fe_ "cprom" "$grubdata/keymap" -type f -name "*.gkb" } add_uboot() @@ -243,16 +241,16 @@ add_uboot() cprom() { - newrom="bin/$target/${pname}_${target}_$initmode.rom" + tmpnew=""; newrom="bin/$target/${pname}_${target}_$initmode.rom" [ -n "$displaymode" ] && newrom="${newrom%.rom}_$displaymode.rom" - [ $# -gt 0 ] && [ "$1" != "seauboot" ] && \ - newrom="${newrom%.rom}_${1%.gkb}.rom" + [ $# -gt 0 ] && [ "$1" != "seauboot" ] && tmpnew="${1##*/}" && \ + newrom="${newrom%.rom}_${tmpnew%.gkb}.rom" x_ mkdir -p "bin/$target" - x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "$1" != "seauboot" ] && \ - cbfs "$newrom" "config/data/grub/keymap/$1" keymap.gkb raw + x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "$1" != "seauboot" ] \ + && cbfs "$newrom" "$grubdata/keymap/$tmpnew" keymap.gkb raw [ $# -gt 0 ] && [ "$1" = "seauboot" ] && \ - cbfs "$newrom" "config/data/grub/bootorder_uboot" bootorder raw; : + cbfs "$newrom" "$grubdata/bootorder_uboot" bootorder raw; : } cbfs() |