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/clean/cbutils | 6 +++--- resources/scripts/build/clean/crossgcc | 3 ++- resources/scripts/build/clean/seabios | 3 ++- resources/scripts/build/clean/u-boot | 7 ++++--- 4 files changed, 11 insertions(+), 8 deletions(-) (limited to 'resources/scripts/build/clean') diff --git a/resources/scripts/build/clean/cbutils b/resources/scripts/build/clean/cbutils index 067c2cb2..bdacc45a 100755 --- a/resources/scripts/build/clean/cbutils +++ b/resources/scripts/build/clean/cbutils @@ -44,15 +44,15 @@ clean_cbutils() # Clean coreboot, of course make -C "${tree}/" distclean || \ - err "cannot distclean coreboot tree, ${tree}" + err "clean_cbutils: ${tree}: cannot distclean" # Clean its utilities as well for util in cbfstool ifdtool nvramtool cbmem; do make distclean -C "${tree}/util/${util}/" || \ - err "cannot clean util, ${util}, at ${tree}" + err "clean_cbutils: ${cbtree} ${util}: can't clean" done make distclean -C "${tree}/payloads/libpayload/" || \ - err "cannot distclean libpayload, at ${tree}" + err "clean_cbutils: ${tree}: can't distclean libpayload" done } diff --git a/resources/scripts/build/clean/crossgcc b/resources/scripts/build/clean/crossgcc index 7b1765f8..c76d1849 100755 --- a/resources/scripts/build/clean/crossgcc +++ b/resources/scripts/build/clean/crossgcc @@ -37,7 +37,8 @@ clean_crossgcc() for board in coreboot/*; do [ -d "${board}" ] || continue [ "${board##*/}" = "coreboot" ] && continue - make -C "${board}/" crossgcc-clean || err "make-clean" + make -C "${board}/" crossgcc-clean || \ + err "clean_crossgcc: ${board}: !make crossgcc-clean" done } diff --git a/resources/scripts/build/clean/seabios b/resources/scripts/build/clean/seabios index c6759e83..0178a729 100755 --- a/resources/scripts/build/clean/seabios +++ b/resources/scripts/build/clean/seabios @@ -40,7 +40,8 @@ clean_seabios() for x in seabios/*; do [ ! -d "${x}" ] && continue [ "${x}" = "seabios/seabios" ] && continue - make -C "${x}" distclean || err "cannot distclean tree, ${x}" + make -C "${x}" distclean || \ + err "clean_seabios: cannot distclean tree, ${x}" done } diff --git a/resources/scripts/build/clean/u-boot b/resources/scripts/build/clean/u-boot index 7ba3a4a9..5deff216 100755 --- a/resources/scripts/build/clean/u-boot +++ b/resources/scripts/build/clean/u-boot @@ -39,11 +39,12 @@ clean_uboot() fi make -C "${board}/" distclean || \ - err "cannot distclean u-boot dir, ${board}" + err "clean_uboot: cannot distclean ${board}" - [ ! -e "${board}/.git" ] || \ + if [ -e "${board}/.git" ]; then git -C "${board}" clean -fdx || \ - err "cannot clean u-boot git repo, ${board}" + err "clean_uboot: ${board}: cannot clean git files" + fi done } -- cgit v1.2.1