diff options
Diffstat (limited to 'resources/scripts/build/grub')
-rwxr-xr-x | resources/scripts/build/grub/payload | 21 | ||||
-rwxr-xr-x | resources/scripts/build/grub/utils | 18 |
2 files changed, 25 insertions, 14 deletions
diff --git a/resources/scripts/build/grub/payload b/resources/scripts/build/grub/payload index 7f1d239f..00ed4d44 100755 --- a/resources/scripts/build/grub/payload +++ b/resources/scripts/build/grub/payload @@ -46,13 +46,16 @@ main() handle_dependencies() { [ -d "grub/" ] || \ - ./fetch grub || err "cannot fetch grub" + ./fetch grub || \ + err "handle_dependencies: cannot fetch grub" [ -f "grub/grub-mkstandalone" ] || \ - ./build grub utils || err "cannot build grub utils" + ./build grub utils || \ + err "handle_dependencies: cannot build grub utils" [ -d "elf/grub" ] || \ - mkdir -p elf/grub || err "cannot create directory, elf/grub" - - rm -f elf/grub/* || err "cannot delete files in directory, elf/grub/" + mkdir -p elf/grub || \ + err "handle_dependencies: cannot mkdir elf/grub" + rm -f elf/grub/* || \ + err "handle_dependencies: cannot rm inside: elf/grub/" } build_grub_payloads() @@ -85,15 +88,17 @@ build_grub_elf() --modules="${grub_modules}" \ --install-modules="${grub_install_modules}" \ ${gcfg} ${grubk} || \ - err "cannot create grub payload (grub-mkstandalone)" + err "build_grub_elf: cannot build grub payload (grub-mkstandalone)" } create_grub_config() { sed "s/usqwerty/${keymap}/" < ${grubcfgsdir}/config/grub.cfg \ - > elf/grub/grub_${keymap}.cfg || err "sed failed: grub.cfg" + > elf/grub/grub_${keymap}.cfg || \ + err "create_grub_config: sed failed: grub.cfg" sed "s/grubtest.cfg/grub.cfg/" < elf/grub/grub_${keymap}.cfg \ - > elf/grub/grub_${keymap}_test.cfg || err "sed failed: grubtest.cfg" + > elf/grub/grub_${keymap}_test.cfg || \ + err "create_grub_config: sed failed: grubtest.cfg" } main $@ diff --git a/resources/scripts/build/grub/utils b/resources/scripts/build/grub/utils index 3ef78227..f0449ed7 100755 --- a/resources/scripts/build/grub/utils +++ b/resources/scripts/build/grub/utils @@ -34,12 +34,18 @@ main() build_grub() { ( - cd grub/ || err "cd" - [ ! -d Makefile ] || make distclean || err "make-distclean" - ./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap" - ./autogen.sh || err "autogen" - ./configure --with-platform=coreboot || err "configure" - make -j$(nproc) || err "make" + cd grub/ || \ + err "build_grub: cd" + [ ! -d Makefile ] || make distclean || \ + err "build_grub: make-distclean" + ./bootstrap --gnulib-srcdir=gnulib/ --no-git || \ + err "build_grub: gnulib bootstrap" + ./autogen.sh || \ + err "build_grub: autogen.sh" + ./configure --with-platform=coreboot || \ + err "build_grub: autoconf" + make -j$(nproc) || \ + err "build_grub: make" ) } |