diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-09-10 15:05:19 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-09-10 15:05:19 +0100 |
| commit | 308c21dd438e5dc27b232a0c31f0e68244ab364f (patch) | |
| tree | 576fc92bec70ef55c27f77d78448e444db417492 | |
| parent | c16b28efad439fed7a5462b2deaf0a63594d3212 (diff) | |
build/boot/roms stragglers: properly handle errors
there were a few missing err calls
i actually went through all of lbmk and found no
instances where err calls were missing except in
build/boot/roms_helper
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rwxr-xr-x | script/build/boot/roms_helper | 7 | ||||
| -rwxr-xr-x | script/update/blobs/mrc | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper index 5b64ad0e..ff8772eb 100755 --- a/script/build/boot/roms_helper +++ b/script/build/boot/roms_helper @@ -317,7 +317,8 @@ build_seabios_roms() else x=${corebootrom} y=${initmode} - t=$(mkSeabiosRom "$x" "fallback/payload" "$y") + t=$(mkSeabiosRom "$x" "fallback/payload" "$y") || \ + err "build_seabios_roms: cannot build tmprom" if [ "${initmode}" = "normal" ]; then newrompath="${romdir}/seabios_${board}_" newrompath="${newrompath}${initmode}.rom" @@ -347,7 +348,9 @@ build_grub_roms() { y=${initmode} if [ "${payload_grub_withseabios}" = "y" ] && \ [ "${firstpayloadname}" = "grub" ]; then - mv "$(mkSeabiosRom "${x}" "seabios.elf" "${y}")" "${tmprompath}" + mv "$(mkSeabiosRom "${x}" "seabios.elf" "${y}")" \ + "${tmprompath}" || \ + err "build_grub_roms: cannot move tmp rom (seabios.elf)" elif [ "${payload_seabios_withgrub}" = "y" ] && \ [ "${firstpayloadname}" != "grub" ]; then mv "$(mkSeabiosRom "${x}" "fallback/payload" "$y")" \ diff --git a/script/update/blobs/mrc b/script/update/blobs/mrc index 681b3699..7e44b634 100755 --- a/script/update/blobs/mrc +++ b/script/update/blobs/mrc @@ -43,6 +43,10 @@ _sha512sum="340a1cd41136a3ba0de9d306db0e65f51640a2efe63aee9934f326b276adc1af0a2d _mrc_complete_hash="e5b6d510a5fdb6a7ba0027588dbceef363a2bf30255e9222020abbe71468822f49962d423d872cc05b37098682281c016445f6aa20f88351a134facfe5f70d5b" _mrc_complete="mrc/haswell/mrc.bin" +# NOTE: the checksums, defined above, are actually sha-2 (sha512sum) +# but google only defines sha1 and md5. we verify with sha1sum, but then +# we use sha512sum in lbmk + cbdir="coreboot/default" cbfstool="cbutils/default/cbfstool" |