diff options
Diffstat (limited to 'script/build')
| -rwxr-xr-x | script/build/grub | 8 | ||||
| -rwxr-xr-x | script/build/roms | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/script/build/grub b/script/build/grub index ba0845d3..31fc0084 100755 --- a/script/build/grub +++ b/script/build/grub @@ -26,7 +26,7 @@ handle_dependencies() [ -d "src/grub" ] || x_ ./update trees -f grub [ -f "src/grub/grub-mkstandalone" ] || build_grub_utils x_ mkdir -p "${elfdir}" - x_ rm -f "${elfdir}/"* + rm -f "${elfdir}/"* || err "!rm elf, handle_, ${elfdir}/" } build_grub_utils() @@ -37,7 +37,7 @@ build_grub_utils() x_ ./bootstrap --gnulib-srcdir=gnulib/ --no-git x_ ./autogen.sh x_ ./configure --with-platform=coreboot - x_ make -j$(nproc) FS_PAYLOAD_MODULES="" + make -j$(nproc) FS_PAYLOAD_MODULES="" || err "!mk grub utils" ) } @@ -47,8 +47,8 @@ build_keymap_configs() [ -f "${keylayoutfile}" ] || continue keymap="${keylayoutfile##${grubcfgsdir}/keymap/}" keymap="${keymap%.gkb}" - x_ printf "keymap %s\n" "${keymap}" > \ - "${elfdir}/keymap_${keymap}.cfg" + printf "keymap %s\n" "${keymap}" > \ + "${elfdir}/keymap_${keymap}.cfg" || err "!insert keymap" done } diff --git a/script/build/roms b/script/build/roms index 2f7b93da..e8cd1c7f 100755 --- a/script/build/roms +++ b/script/build/roms @@ -136,7 +136,7 @@ prepare_target() [ "${payload_memtest}" != "y" ] || [ -f "src/${memtest_bin}" ] || \ x_ ./update trees -b memtest86plus - x_ rm -f "${romdir}/"* + rm -f "${romdir}/"* || err "!prepare, rm files, ${romdir}" build_dependency_grub build_dependency_uboot @@ -274,15 +274,17 @@ build_grub_roms() if [ "${displaymode}" = "vesafb" ] || \ [ "${displaymode}" = "corebootfb" ]; then backgroundfile="config/grub/background/${grub_background}" - x_ "${cbfstool}" "${tmprom}" add -f ${backgroundfile} \ - -n background.png -t raw + "${cbfstool}" "${tmprom}" add -f ${backgroundfile} \ + -n background.png -t raw || err "insert background, ${backgroundfile}" fi tmpcfg=$(mktemp -t coreboot_rom.XXXXXXXXXX) - x_ printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}" + printf "set grub_scan_disk=\"%s\"\n" "${grub_scan_disk}" >"${tmpcfg}" \ + || err "set grub_scandisk, ${grub_scan_disk}, ${tmpcfg}" [ "${grub_scan_disk}" = "both" ] || \ x_ "${cbfstool}" "${tmprom}" add -f "${tmpcfg}" -n scan.cfg -t raw - x_ printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" + printf "set timeout=%s\n" "${grub_timeout}" > "${tmpcfg}" || \ + err "set timeout, ${grub_timeout}, ${tmpcfg}" [ -z "${grub_timeout}" ] || x_ "${cbfstool}" "${tmprom}" add \ -f "${tmpcfg}" -n timeout.cfg -t raw x_ rm -f "${tmpcfg}" |