From 59dba6cfcdc6c154e4d46c14c42e7b6f0b84c7b5 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Wed, 16 Aug 2023 21:34:21 +0100
Subject: merge coreboot/u-boot download logic to one script

they are fundamentally the same, in an lbmk context.

they are downloaded in the same way, and compiled in
the same way!

(Kconfig infrastructure, board-specific code, the way
submodules are used in git, etc)

~200 sloc reduction in resources/scripts

the audit begins

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 resources/scripts/build/release/roms | 12 ++++++------
 resources/scripts/build/release/src  | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 13 deletions(-)

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

diff --git a/resources/scripts/build/release/roms b/resources/scripts/build/release/roms
index c60070ec..faf07af0 100755
--- a/resources/scripts/build/release/roms
+++ b/resources/scripts/build/release/roms
@@ -24,14 +24,14 @@ set -u -e
 projectname="$(cat projectname)"
 version="version-unknown"
 versiondate="version-date-unknown"
-cbtree="default"
+tree="default"
 target=""
 CONFIG_HAVE_MRC=""
 CONFIG_HAVE_ME_BIN=""
 CONFIG_KBC1126_FIRMWARE=""
 CONFIG_INCLUDE_SMSC_SCH5545_EC_FW=""
-ifdtool="cbutils/${cbtree}/ifdtool"
-cbfstool="cbutils/${cbtree}/cbfstool"
+ifdtool="cbutils/${tree}/ifdtool"
+cbfstool="cbutils/${tree}/cbfstool"
 
 main()
 {
@@ -118,10 +118,10 @@ strip_archive()
 {
 	romdir=${1}
 
-	if [ ! -d coreboot/${cbtree} ]; then
-		./download coreboot ${cbtree} || exit 1
+	if [ ! -d coreboot/${tree} ]; then
+		./fetch_trees coreboot ${tree} || exit 1
 	fi
-	./build module cbutils ${cbtree} || exit 1
+	./build module cbutils ${tree} || exit 1
 
 	rm -Rf "${romdir}_tmp" # dirty hack, to reduce disk io later
 	# rather than using /tmp, which might not be tmpfs
diff --git a/resources/scripts/build/release/src b/resources/scripts/build/release/src
index 0e3237ab..95c0036f 100755
--- a/resources/scripts/build/release/src
+++ b/resources/scripts/build/release/src
@@ -23,13 +23,15 @@ set -u -e
 
 projectname="$(cat projectname)"
 
-modlist="coreboot flashrom grub memtest86plus seabios me_cleaner u-boot"
-modlist="${modlist} bios_extract biosutilities uefitool"
+trees_gitclone_list="coreboot u-boot"
+simple_gitclone_list="flashrom grub memtest86plus seabios me_cleaner uefitool"
+simple_gitclone_list="${simple_gitclone_list} bios_extract biosutilities"
 
 dirlist="resources util" # do not add blobs directory here. it's handled below
 
 filelist="lbmk blobutil modify download build README.md COPYING Makefile update"
 filelist="${filelist} version versiondate projectname .gitcheck gitclone"
+filelist="${filelist} fetch_trees"
 
 version="version-unknown"
 versiondate="version-date-unknown"
@@ -75,16 +77,19 @@ create_release_directory()
 
 download_modules()
 {
-	for modname in ${modlist}; do
-		if [ ! -d "${modname}/" ]; then
-			./download ${modname}
-		fi
+	for modname in ${trees_gitclone_list}; do
+		[ ! -d "${modname}" ] && \
+		    ./fetch_trees ${modname}
+	done
+	for modname in ${simple_gitclone_list}; do
+		[ ! -d "${modname}/" ] && \
+		    ./download ${modname}
 	done
 }
 
 copy_files()
 {
-	for dir in ${modlist} ${dirlist}; do
+	for dir in ${simple_gitclone_list} ${dirlist}; do
 		cp -R "${dir}/" "${srcdir}/"
 	done
 
-- 
cgit v1.2.1