diff options
| author | Leah Rowe <info@minifree.org> | 2017-09-03 14:43:19 +0000 |
|---|---|---|
| committer | Gogs <gogitservice@gmail.com> | 2017-09-03 14:43:19 +0000 |
| commit | 5e7b1de1df92d1db32f9e28516a99c1096ff90d5 (patch) | |
| tree | 6d4f36034be29b0bfab020081b8a73ad83469a1c /projects/grub/grub-helper | |
| parent | 422f5de5c83b25d2835a5baa1bd5ed876d60bd5e (diff) | |
| parent | a9fe65d0a0218352420b289a6535d8c668d64c5d (diff) | |
| download | librebootfr-5e7b1de1df92d1db32f9e28516a99c1096ff90d5.tar.gz librebootfr-5e7b1de1df92d1db32f9e28516a99c1096ff90d5.zip | |
Merge branch 'grub-integration' of kragle/libreboot into master
Diffstat (limited to 'projects/grub/grub-helper')
| -rwxr-xr-x | projects/grub/grub-helper | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/projects/grub/grub-helper b/projects/grub/grub-helper index 342b03eb..3e1420ac 100755 --- a/projects/grub/grub-helper +++ b/projects/grub/grub-helper @@ -82,10 +82,15 @@ grub_build_utils() { grub_build_layout() { local raw_layout="${1##*/}" local raw_layout_path="$1" - local grub_kbdcomp="${sources_path}/grub-kbdcomp" - local grub_kbd_layout="${build_path}/${raw_layout}.gkb" + local keymap_out_path="${build_path}/keymaps" + local grub_mklayout="${sources_path}/grub-mklayout" + local grub_kbd_layout="${keymap_out_path}/${raw_layout}.gkb" - "${grub_kbdcomp}" --output="${grub_kbd_layout}" "${raw_layout_path}" + if ! [[ -e "${keymap_out_path}" ]]; then + mkdir -p "${keymap_out_path}" + fi + + "${grub_mklayout}" --output="${grub_kbd_layout}" --input="${raw_layout_path}" } grub_build_bootable_image() { |