diff options
author | Swift Geek <swiftgeek@gmail.com> | 2019-04-19 03:45:23 +0000 |
---|---|---|
committer | Gogs <gogitservice@gmail.com> | 2019-04-19 03:45:23 +0000 |
commit | 8d3cd741781cab0d936814170df70f637bfd48b7 (patch) | |
tree | 46257b9e1937fd7e4dcf529a0a1bdb9dbb42f628 /projects | |
parent | fffd9a3eb72f8a55a7e439e8a05185f2d8dd8983 (diff) | |
parent | 1c5677e98e25aa2eaa2f545d851678c05127445d (diff) | |
download | librebootfr-8d3cd741781cab0d936814170df70f637bfd48b7.tar.gz librebootfr-8d3cd741781cab0d936814170df70f637bfd48b7.zip |
Merge branch 'bugs' of and_who/libreboot into master
Diffstat (limited to 'projects')
-rwxr-xr-x | projects/grub/grub | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/projects/grub/grub b/projects/grub/grub index 8bc7cd43..3daca888 100755 --- a/projects/grub/grub +++ b/projects/grub/grub @@ -79,25 +79,28 @@ build() { local build_path="$(project_build_path "$project" "$@")" local raw_keymap_path="$project_path/$CONFIGS/keymaps" - mkdir -p "$build_path" + ( + set -e - grub_build_utils + mkdir -p "$build_path" - if [[ "$target" == 'bios' ]]; then - grub_build_floppy_image - else - grub_build_standalone_image - fi + grub_build_utils - for raw_keymap in "$raw_keymap_path"/*; do - grub_build_layout "$raw_keymap" - done + if [[ "$target" == 'bios' ]]; then + grub_build_floppy_image + else + grub_build_standalone_image + fi - grub_build_font + for raw_keymap in "$raw_keymap_path"/*; do + grub_build_layout "$raw_keymap" + done - grub_copy_modules + grub_build_font + grub_copy_modules - make -C "$sources_path" distclean + make -C "$sources_path" distclean + ) } build_check() { |