From b9662fbe3634af2946f0423a021c4f04c983c169 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 1 Sep 2023 08:30:08 +0100
Subject: handle project downloads in main lbmk script

this means the unified /tmp handling is now provided for
in both the former "fetch" and "fetch_trees" script, which
are now (respectively):

./update project repo
./update project trees

if the fetch scripts weren't cleaning /tmp before, they
now are, because lbmk handles it

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/build/coreboot/utils | 2 +-
 script/build/grub/payload   | 2 +-
 script/build/grub/utils     | 2 +-
 script/build/release/roms   | 2 +-
 script/build/release/src    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'script/build')

diff --git a/script/build/coreboot/utils b/script/build/coreboot/utils
index bf0c47a7..f7af680b 100755
--- a/script/build/coreboot/utils
+++ b/script/build/coreboot/utils
@@ -55,7 +55,7 @@ build_for_mainboard() {
 buildutils() {
 	tree="${1}"
 	[ -d "coreboot/${tree}/" ] || \
-		./fetch_trees coreboot $tree || \
+		./update project trees coreboot $tree || \
 		    err "buildutils: cannot fetch ${tree}"
 	for util in cbfstool ifdtool; do
 		[ -f "cbutils/${tree}/${util}" ] && continue
diff --git a/script/build/grub/payload b/script/build/grub/payload
index f8a49b64..359fc1f7 100755
--- a/script/build/grub/payload
+++ b/script/build/grub/payload
@@ -72,7 +72,7 @@ main()
 handle_dependencies()
 {
 	[ -d "grub/" ] || \
-		./fetch grub || \
+		./update project repo grub || \
 		    err "handle_dependencies: cannot fetch grub"
 	[ -f "grub/grub-mkstandalone" ] || \
 		./build grub utils || \
diff --git a/script/build/grub/utils b/script/build/grub/utils
index 3a282f2e..cb80d15d 100755
--- a/script/build/grub/utils
+++ b/script/build/grub/utils
@@ -27,7 +27,7 @@ set -u -e
 main()
 {
 	printf "Building GRUB\n"
-	[ -d "grub/" ] || ./fetch grub || err "cannot fetch grub"
+	[ -d "grub/" ] || ./update project repo grub || err "cannot fetch grub"
 	build_grub
 }
 
diff --git a/script/build/release/roms b/script/build/release/roms
index fa27c031..ad789477 100755
--- a/script/build/release/roms
+++ b/script/build/release/roms
@@ -145,7 +145,7 @@ strip_archive()
 	romdir=${1}
 
 	[ -d "coreboot/${tree}" ] || \
-		./fetch_trees coreboot ${tree} || \
+		./update project trees coreboot ${tree} || \
 		    err "strip_archive: coreboot/${tree}: can't fetch source"
 	./build coreboot utils ${tree} || \
 	    err "strip_archive: coreboot/${tree}: can't build utils"
diff --git a/script/build/release/src b/script/build/release/src
index d72347c3..3067440b 100755
--- a/script/build/release/src
+++ b/script/build/release/src
@@ -85,11 +85,11 @@ create_release_directory()
 download_modules()
 {
 	for modname in ${trees_fetch_list}; do
-		[ -d "${modname}" ] || ./fetch_trees ${modname} || \
+		[ -d "${modname}" ] || ./update project trees ${modname} || \
 		    err "download_modules: couldn't download ${modname} trees"
 	done
 	for modname in ${simple_fetch_list}; do
-		[ -d "${modname}/" ] || ./fetch ${modname} || \
+		[ -d "${modname}/" ] || ./update project repo ${modname} || \
 		    err "download_modules: couldn't download ${modname} repo"
 	done
 }
-- 
cgit v1.2.1