From 1c8401be25e4749a2eee5ddc77ce7c6ac880c910 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 24 Aug 2023 20:19:41 +0100 Subject: much, much stricter, more verbose error handling lbmk is much more likely to crash now, in error conditions, which is a boon for further auditing. also: in "fetch", remove the downloaded program if fail() was called. this would also be done for gnulib, when downloading grub, but done in such a way that gnulib goes first. where calls to err write "ERROR" in the string, they no longer say "ERROR" because the "err" function itself now does that automatically. also: listmodes/listoptions (in "lbmk") now reports an error if no scripts and/or directories are found. also: where a warning is given, but not an error, i've gone through in some places and redirected the output to stderr, not stdout as part of error checks: running anything as root, except for the "./build dependencies *" commands, is no longer permitted and lbmk will throw an error mrc downloads: debugfs output no longer redirected to /dev/null, and stderr no longer redirected to stdout. everything is verbose. certain non-error states are also more verbose. for example, patch_rom in blobs/inject will now state when injection succeeds certain actual errors(bugs) were fixed: for example, build/release/roms now correctly prepares the blobs hash files for a given target, containing only the files and checksums in the list. Previously, a printf message was included. Now, with this new code: blobutil/inject rightly verifies hashes. doing all of this in one giant patch is cleaner than 100 patches changing each file. even this is yet part of a much larger audit going on in the Libreboot project. Signed-off-by: Leah Rowe --- resources/scripts/build/coreboot/utils | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'resources/scripts/build/coreboot/utils') diff --git a/resources/scripts/build/coreboot/utils b/resources/scripts/build/coreboot/utils index d381f9e2..bf0c47a7 100755 --- a/resources/scripts/build/coreboot/utils +++ b/resources/scripts/build/coreboot/utils @@ -48,7 +48,7 @@ build_for_mainboard() { tree="undefined" . "resources/coreboot/${board}/target.cfg" # source [ "${tree}" = "undefined" ] && \ - err "build/cbutils: improper tree definition for '${board}'" + err "build_for_mainboard: improper tree definition for '${board}'" buildutils "${tree}" } @@ -56,19 +56,22 @@ buildutils() { tree="${1}" [ -d "coreboot/${tree}/" ] || \ ./fetch_trees coreboot $tree || \ - err "cannot fetch ${tree}" + err "buildutils: cannot fetch ${tree}" for util in cbfstool ifdtool; do [ -f "cbutils/${tree}/${util}" ] && continue [ -d "cbutils/${tree}" ] || \ mkdir -p "cbutils/${tree}" || \ - err "cannot create directory, cbutils/${tree}" + err "buildutils: can't mkdir cbutils/${tree}" utildir="coreboot/${tree}/util/${util}" - make distclean -C "${utildir}" || err "cannot clean ${utildir}" - make -j$(nproc) -C "${utildir}" || err "cannot build ${utildir}" + make distclean -C "${utildir}" || \ + err "buildutils: cannot clean ${utildir}" + make -j$(nproc) -C "${utildir}" || \ + err "buildutils: cannot build ${utildir}" cp "${utildir}/${util}" "cbutils/${tree}" || \ - err "cannot copy util, ${util}, to cbutils/${tree}/" - make distclean -C "${utildir}" || err "can't clean ${utildir}" + err "buildutils: can't cp ${util} cbutils/${tree}/" + make distclean -C "${utildir}" || \ + err "buildutils: can't clean ${utildir}" done } -- cgit v1.2.1