From 1e89264ce326997f95391e00f1fa71319f1bb226 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 7 Oct 2023 06:55:10 +0100 Subject: update/project/*: merge to update/project/trees Just one script. Just one! Well, two, but the 2nd one already existed: logic in update/project/trees and update/project/repo was merged into include/git.sh and update/project/build was renamed to update/project/trees; an -f option was added, which calls the functions under git.sh so git clones are now handled by the main build script (for handling makefiles and defconfigs) but the logic there is a stub, where git.sh does all the actual heavy lifting this cuts the file count down by two, and reduces sloccount a reasonable amount because much of the logic already exists in the build script, when it comes to handling targets. git.sh was adjusted to integrate with this, rather than act standalone Signed-off-by: Leah Rowe --- script/update/vendor/download | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'script/update/vendor/download') diff --git a/script/update/vendor/download b/script/update/vendor/download index aec59c1f..de5abb68 100755 --- a/script/update/vendor/download +++ b/script/update/vendor/download @@ -41,16 +41,16 @@ detect_firmware() build_dependencies() { [ -d ${cbdir} ] || \ - x_ ./update project trees coreboot ${cbdir##*/} + x_ ./update project trees -f coreboot ${cbdir##*/} for d in uefitool biosutilities bios_extract me_cleaner; do [ -d "src/${d}" ] && continue - x_ ./update project repo "${d}" + x_ ./update project trees -f "${d}" done [ -f "${uefiextract}" ] || \ - x_ ./update project build -b uefitool + x_ ./update project trees -b uefitool [ -f "${kbc1126_ec_dump}" ] || \ x_ make -C "${cbdir}/util/kbc1126" - x_ ./update project build -b coreboot utils default + x_ ./update project trees -b coreboot utils default } download_vendorfiles() -- cgit v1.2.1