From 710171f92b06cfcd7de4d29e29ffa0fe8aee1266 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Fri, 29 Sep 2023 16:37:18 +0100
Subject: update/blobs/*: simplify mrc.bin handling

mrc.bin is now handled by include/mrc.sh, adapted
from now-deleted script/update/blobs/mrc

much of the logic has been re-written or adapted for
inside script/update/blobs/download

mrc links/hashes now defined in config/blobs/sources

the new code is simpler (and smaller). in addition,
lbmk can now easily handle mrc.bin files for other
platforms such as broadwell. watch this space.

the full .zip download is now cached, like with other
vendor downloads. this means it won't be re-downloaded
if it was already downloaded before.

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 script/update/blobs/download | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'script/update/blobs/download')

diff --git a/script/update/blobs/download b/script/update/blobs/download
index e4c7b214..ca8302d2 100755
--- a/script/update/blobs/download
+++ b/script/update/blobs/download
@@ -8,6 +8,9 @@
 . "include/defconfig.sh"
 . "include/blobutil.sh"
 . "include/fetch.sh"
+. "include/mrc.sh"
+
+export PATH="${PATH}:/sbin"
 
 main()
 {
@@ -58,10 +61,11 @@ build_dependencies()
 	done
 	[ -f uefitool/uefiextract ] || ./handle make file -b uefitool || \
 	    err "build_dependencies: can't build uefitool"
-	if [ ! -f "${cbdir}/util/kbc1126/kbc1126_ec_dump" ]; then
+	[ -f "${cbdir}/util/kbc1126/kbc1126_ec_dump" ] || \
 		make -C "${cbdir}/util/kbc1126" || \
 		    err "build_dependencies: can't build kbc1126_ec_dump"
-	fi
+	./build coreboot utils default || \
+	    err "build_dependencies: cannot build utils in cbutils/default/"
 }
 
 download_blobs()
@@ -81,7 +85,8 @@ download_blobs()
 		    "${E6400_VGA_DL_url_bkup}" "${E6400_VGA_DL_hash}" \
 		    "${blobdir}/cache/${E6400_VGA_DL_hash}" "err"
 	if [ ! -z "${CONFIG_HAVE_MRC}" ]; then
-		./update blobs mrc || err "download_blobs ${board}: !mrc"
+		fetch "mrc" "${MRC_url}" "${MRC_url_bkup}" "${MRC_hash}" \
+		    "${blobdir}/cache/${MRC_hash}" "err"
 	fi
 }
 
@@ -220,7 +225,8 @@ mkdirs()
 extract_archive()
 {
 	innoextract "${1}" -d "${2}" || python "${pfs_extract}" "${1}" -e || \
-	     7z x "${1}" -o"${2}" || unar "${1}" -o "${2}" || return 1
+	    7z x "${1}" -o"${2}" || unar "${1}" -o "${2}" || \
+	    unzip "${1}" -d "${2}" || return 1
 }
 
 main $@
-- 
cgit v1.2.1