libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

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>
btrfsvols
Leah Rowe 2023-09-10 15:05:19 +01:00
parent c16b28efad
commit 308c21dd43
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
script/build/boot/roms_helper
View File

@ -317,7 +317,8 @@ build_seabios_roms()
else else
x=${corebootrom} x=${corebootrom}
y=${initmode} 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 if [ "${initmode}" = "normal" ]; then
newrompath="${romdir}/seabios_${board}_" newrompath="${romdir}/seabios_${board}_"
newrompath="${newrompath}${initmode}.rom" newrompath="${newrompath}${initmode}.rom"
@ -347,7 +348,9 @@ build_grub_roms() {
y=${initmode} y=${initmode}
if [ "${payload_grub_withseabios}" = "y" ] && \ if [ "${payload_grub_withseabios}" = "y" ] && \
[ "${firstpayloadname}" = "grub" ]; then [ "${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" ] && \ elif [ "${payload_seabios_withgrub}" = "y" ] && \
[ "${firstpayloadname}" != "grub" ]; then [ "${firstpayloadname}" != "grub" ]; then
mv "$(mkSeabiosRom "${x}" "fallback/payload" "$y")" \ mv "$(mkSeabiosRom "${x}" "fallback/payload" "$y")" \

4
script/update/blobs/mrc
View File

@ -43,6 +43,10 @@ _sha512sum="340a1cd41136a3ba0de9d306db0e65f51640a2efe63aee9934f326b276adc1af0a2d
_mrc_complete_hash="e5b6d510a5fdb6a7ba0027588dbceef363a2bf30255e9222020abbe71468822f49962d423d872cc05b37098682281c016445f6aa20f88351a134facfe5f70d5b" _mrc_complete_hash="e5b6d510a5fdb6a7ba0027588dbceef363a2bf30255e9222020abbe71468822f49962d423d872cc05b37098682281c016445f6aa20f88351a134facfe5f70d5b"
_mrc_complete="mrc/haswell/mrc.bin" _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" cbdir="coreboot/default"
cbfstool="cbutils/default/cbfstool" cbfstool="cbutils/default/cbfstool"