From b9662fbe3634af2946f0423a021c4f04c983c169 Mon Sep 17 00:00:00 2001 From: Leah Rowe 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 --- script/update/blobs/download | 4 ++-- script/update/blobs/extract | 4 ++-- script/update/blobs/inject | 3 ++- script/update/blobs/mrc | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'script/update/blobs') diff --git a/script/update/blobs/download b/script/update/blobs/download index 1d18cf7e..f49ab79f 100755 --- a/script/update/blobs/download +++ b/script/update/blobs/download @@ -157,11 +157,11 @@ EOF build_dependencies() { [ -d ${cbdir} ] || \ - ./fetch_trees coreboot ${cbdir##*/} || \ + ./update project trees coreboot ${cbdir##*/} || \ err "build_dependencies: can't fetch ${cbdir}" for d in uefitool biosutilities bios_extract me_cleaner; do [ -d "${d}" ] && continue - ./fetch "${d}" || \ + ./update project repo "${d}" || \ err "build_dependencies: can't fetch ${d}" done [ -f uefitool/uefiextract ] || \ diff --git a/script/update/blobs/extract b/script/update/blobs/extract index c62700f2..ad77abd4 100755 --- a/script/update/blobs/extract +++ b/script/update/blobs/extract @@ -56,10 +56,10 @@ check_board() build_dependencies() { if [ ! -d me_cleaner ]; then - ./fetch me_cleaner || \ + ./update project repo me_cleaner || \ err "build_dependencies: can't fetch me_cleaner" elif [ ! -d "${cbdir}" ]; then - ./fetch_trees coreboot default || \ + ./update project trees coreboot default || \ err "build_dependencies: can't fetch coreboot" elif [ ! -f "${ifdtool}" ]; then make -C "${ifdtool%/ifdtool}" || \ diff --git a/script/update/blobs/inject b/script/update/blobs/inject index 08bbf41a..7efab2a9 100755 --- a/script/update/blobs/inject +++ b/script/update/blobs/inject @@ -123,7 +123,8 @@ detect_board() build_dependencies() { - [ -d "${cbdir}" ] || ./fetch_trees coreboot default + [ -d "${cbdir}" ] || ./update project trees coreboot default || \ + err "build_dependencies: could not download coreboot/default" ./build coreboot utils default || \ err "build_dependencies: could not build cbutils" ./update blobs download ${board} || \ diff --git a/script/update/blobs/mrc b/script/update/blobs/mrc index c069e678..420fa42f 100755 --- a/script/update/blobs/mrc +++ b/script/update/blobs/mrc @@ -71,7 +71,7 @@ check_existing() build_dependencies() { - [ -d "${cbdir}/" ] || ./fetch_trees coreboot default || \ + [ -d "${cbdir}/" ] || ./update project trees coreboot default || \ err "build_dependencies: cannot fetch coreboot/default" ./build coreboot utils default || \ err "build_dependencies: cannot build cbutils/default" -- cgit v1.2.1