canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rom.sh: specifically check keymaps in cprom() 

"not seauboot" is a valid check at present, but if
i start supporting other arguments in the future,
this code would have to change.

therefore, i change it in advance, on that theory.

this new check is more technically correct. these
lines are triggered when inserting grub keymaps.

Signed-off-by: Leah Rowe <leah@libreboot.org>
25.04_branch
Leah Rowe 2025-05-05 17:53:02 +01:00
parent 9342e5bb61
commit 1c0c88c7cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rom.sh
View File

@ -241,11 +241,11 @@ cprom()
{ {
tmpnew=""; newrom="bin/$target/${pname}_${target}_$initmode.rom" tmpnew=""; newrom="bin/$target/${pname}_${target}_$initmode.rom"
[ -n "$displaymode" ] && newrom="${newrom%.rom}_$displaymode.rom" [ -n "$displaymode" ] && newrom="${newrom%.rom}_$displaymode.rom"
[ $# -gt 0 ] && [ "$1" != "seauboot" ] && tmpnew="${1##*/}" && \ [ $# -gt 0 ] && [ "${1%.gkb}" != "$1" ] && tmpnew="${1##*/}" && \
newrom="${newrom%.rom}_${tmpnew%.gkb}.rom" newrom="${newrom%.rom}_${tmpnew%.gkb}.rom"
x_ mkdir -p "bin/$target" x_ mkdir -p "bin/$target"
x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "$1" != "seauboot" ] \ x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "${1%.gkb}" != "$1" ] \
&& cbfs "$newrom" "$grubdata/keymap/$tmpnew" keymap.gkb raw && cbfs "$newrom" "$grubdata/keymap/$tmpnew" keymap.gkb raw
[ $# -gt 0 ] && [ "$1" = "seauboot" ] && \ [ $# -gt 0 ] && [ "$1" = "seauboot" ] && \
cbfs "$newrom" "$grubdata/bootorder_uboot" bootorder raw; : cbfs "$newrom" "$grubdata/bootorder_uboot" bootorder raw; :