From 89c7df5adcf1a01fb530b84198d87a096217a162 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Fri, 1 Sep 2017 23:03:08 -0400 Subject: Use grub-mklayout instead of grub-kbdcomp grub-mklayout was the intended program to use for generating compiled GRUB keylayouts. Somewhere along the way grub-kbdcomp was erroneously substituted in its place. --- projects/grub/grub-helper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'projects/grub/grub-helper') diff --git a/projects/grub/grub-helper b/projects/grub/grub-helper index 342b03eb..dca9b3a5 100755 --- a/projects/grub/grub-helper +++ b/projects/grub/grub-helper @@ -82,10 +82,10 @@ grub_build_utils() { grub_build_layout() { local raw_layout="${1##*/}" local raw_layout_path="$1" - local grub_kbdcomp="${sources_path}/grub-kbdcomp" + local grub_mklayout="${sources_path}/grub-mklayout" local grub_kbd_layout="${build_path}/${raw_layout}.gkb" - "${grub_kbdcomp}" --output="${grub_kbd_layout}" "${raw_layout_path}" + "${grub_mklayout}" --output="${grub_kbd_layout}" --input="${raw_layout_path}" } grub_build_bootable_image() { -- cgit v1.2.3-70-g09d2 From 0b4d473546bedc7c1431c63602d56a718c071dc8 Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Fri, 1 Sep 2017 23:51:49 -0400 Subject: Conditionally create dir to store compiled keymaps --- projects/grub/grub-helper | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'projects/grub/grub-helper') diff --git a/projects/grub/grub-helper b/projects/grub/grub-helper index dca9b3a5..3e1420ac 100755 --- a/projects/grub/grub-helper +++ b/projects/grub/grub-helper @@ -82,8 +82,13 @@ grub_build_utils() { grub_build_layout() { local raw_layout="${1##*/}" local raw_layout_path="$1" + local keymap_out_path="${build_path}/keymaps" local grub_mklayout="${sources_path}/grub-mklayout" - local grub_kbd_layout="${build_path}/${raw_layout}.gkb" + local grub_kbd_layout="${keymap_out_path}/${raw_layout}.gkb" + + if ! [[ -e "${keymap_out_path}" ]]; then + mkdir -p "${keymap_out_path}" + fi "${grub_mklayout}" --output="${grub_kbd_layout}" --input="${raw_layout_path}" } -- cgit v1.2.3-70-g09d2