From 1c8401be25e4749a2eee5ddc77ce7c6ac880c910 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
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 <leah@libreboot.org>
---
 resources/scripts/build/grub/payload | 21 +++++++++++++--------
 resources/scripts/build/grub/utils   | 18 ++++++++++++------
 2 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'resources/scripts/build/grub')

diff --git a/resources/scripts/build/grub/payload b/resources/scripts/build/grub/payload
index 7f1d239f..00ed4d44 100755
--- a/resources/scripts/build/grub/payload
+++ b/resources/scripts/build/grub/payload
@@ -46,13 +46,16 @@ main()
 handle_dependencies()
 {
 	[ -d "grub/" ] || \
-		./fetch grub || err "cannot fetch grub"
+		./fetch grub || \
+		    err "handle_dependencies: cannot fetch grub"
 	[ -f "grub/grub-mkstandalone" ] || \
-		./build grub utils || err "cannot build grub utils"
+		./build grub utils || \
+		    err "handle_dependencies: cannot build grub utils"
 	[ -d "elf/grub" ] || \
-		mkdir -p elf/grub || err "cannot create directory, elf/grub"
-
-	rm -f elf/grub/* || err "cannot delete files in directory, elf/grub/"
+		mkdir -p elf/grub || \
+		    err "handle_dependencies: cannot mkdir elf/grub"
+	rm -f elf/grub/* || \
+	    err "handle_dependencies: cannot rm inside: elf/grub/"
 }
 
 build_grub_payloads()
@@ -85,15 +88,17 @@ build_grub_elf()
 	    --modules="${grub_modules}" \
 	    --install-modules="${grub_install_modules}" \
 	    ${gcfg} ${grubk} || \
-	    err "cannot create grub payload (grub-mkstandalone)"
+	    err "build_grub_elf: cannot build grub payload (grub-mkstandalone)"
 }
 
 create_grub_config()
 {
 	sed "s/usqwerty/${keymap}/" < ${grubcfgsdir}/config/grub.cfg \
-	    > elf/grub/grub_${keymap}.cfg || err "sed failed: grub.cfg"
+	    > elf/grub/grub_${keymap}.cfg || \
+	    err "create_grub_config: sed failed: grub.cfg"
 	sed "s/grubtest.cfg/grub.cfg/" < elf/grub/grub_${keymap}.cfg \
-	    > elf/grub/grub_${keymap}_test.cfg || err "sed failed: grubtest.cfg"
+	    > elf/grub/grub_${keymap}_test.cfg || \
+	    err "create_grub_config: sed failed: grubtest.cfg"
 }
 
 main $@
diff --git a/resources/scripts/build/grub/utils b/resources/scripts/build/grub/utils
index 3ef78227..f0449ed7 100755
--- a/resources/scripts/build/grub/utils
+++ b/resources/scripts/build/grub/utils
@@ -34,12 +34,18 @@ main()
 build_grub()
 {
 	(
-	cd grub/ || err "cd"
-	[ ! -d Makefile ] || make distclean || err "make-distclean"
-	./bootstrap --gnulib-srcdir=gnulib/ --no-git || err "bootstrap"
-	./autogen.sh || err "autogen"
-	./configure --with-platform=coreboot || err "configure"
-	make -j$(nproc) || err "make"
+	cd grub/ || \
+	    err "build_grub: cd"
+	[ ! -d Makefile ] || make distclean || \
+	    err "build_grub: make-distclean"
+	./bootstrap --gnulib-srcdir=gnulib/ --no-git || \
+	    err "build_grub: gnulib bootstrap"
+	./autogen.sh || \
+	    err "build_grub: autogen.sh"
+	./configure --with-platform=coreboot || \
+	    err "build_grub: autoconf"
+	make -j$(nproc) || \
+	    err "build_grub: make"
 	)
 }
 
-- 
cgit v1.2.1