From ea7fae97bd93ecbb82a1100c220d13a1f39d6ab2 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Mon, 4 Sep 2023 14:54:36 +0100
Subject: build/boot/roms: don't create empty bin/ directory

also: only return zero status if rom images were succesfully
built, and print a list of each rom image directory based on
what was actually compiled, rather than just saying that the
rom images are stored under bin/

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/build/boot/roms        | 10 ++++++++--
 script/build/boot/roms_helper |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'script/build')

diff --git a/script/build/boot/roms b/script/build/boot/roms
index e5b06423..52e7198c 100755
--- a/script/build/boot/roms
+++ b/script/build/boot/roms
@@ -35,6 +35,7 @@ read projectname < projectname
 opts=""
 boards=
 firstoption=""
+targets=""
 
 main()
 {
@@ -68,14 +69,19 @@ main()
 	if [ "${firstoption}" = "all" ]; then
 		for target in $(./build command options config/coreboot); do
 			buildrom "${target}" || err "build/roms (1): error"
+			[ -d "bin/${target}" ] && targets="${target} ${targets}"
 		done
 	else
 		for board in ${boards}; do
 			buildrom "${board}" || err "build/roms (2): error"
+			[ -d "bin/${board}" ] && targets="${board} ${targets}"
 		done
 	fi
-
-	printf "\n\nDone! Your ROMs are in bin/\n\n"
+	[ -z "${targets}" ] && err "No ROM images were compiled."
+	printf "\n\nYour ROM images are available in these directories:\n"
+	for x in ${targets}; do
+		printf "* bin/%s\n" "${x}"
+	done
 }
 
 usage()
diff --git a/script/build/boot/roms_helper b/script/build/boot/roms_helper
index a5cdb85c..76487877 100755
--- a/script/build/boot/roms_helper
+++ b/script/build/boot/roms_helper
@@ -186,8 +186,6 @@ build_dependencies()
 		./handle make file -b ${memtest_bin%/*} || \
 		    err "cannot build memtest86+"
 
-	[ -d "${romdir}/" ] || mkdir -p "${romdir}/" || \
-	    err "cannot create rom directory: \"${romdir}\""
 	rm -f "${romdir}"/* || err "cannot: rm -f \"${romdir}\"/*"
 
 	build_dependency_grub
@@ -529,6 +527,9 @@ moverom() {
 
 	printf "\nCreating new ROM image: %s\n" "${newrompath}"
 
+	[ -d "${newrompath%/*}" ] || mkdir -p "${newrompath%/*}/" || \
+	    err "moverom: cannot create rom directory: \"${newrompath%/*}\""
+
 	[ "${blobs_required}" = "n" ] && \
 		newrompath="${newrompath%.rom}_noblobs.rom"
 
-- 
cgit v1.2.1