diff options
author | Leah Rowe <leah@libreboot.org> | 2023-10-07 06:55:10 +0100 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2023-10-07 10:26:11 +0100 |
commit | 1e89264ce326997f95391e00f1fa71319f1bb226 (patch) | |
tree | f1a577604f4ff74fe7f122b1f511e93499adac27 /script/update/vendor | |
parent | a413c01a3ef90f7befc5805b233b67b9352ee727 (diff) |
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 <leah@libreboot.org>
Diffstat (limited to 'script/update/vendor')
-rwxr-xr-x | script/update/vendor/download | 8 | ||||
-rwxr-xr-x | script/update/vendor/inject | 4 |
2 files changed, 6 insertions, 6 deletions
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() diff --git a/script/update/vendor/inject b/script/update/vendor/inject index 846f1846..3340a723 100755 --- a/script/update/vendor/inject +++ b/script/update/vendor/inject @@ -87,8 +87,8 @@ detect_board() build_dependencies() { - [ -d "${cbdir}" ] || x_ ./update project trees coreboot default - x_ ./update project build -b coreboot utils default + [ -d "${cbdir}" ] || x_ ./update project trees -f coreboot default + x_ ./update project trees -b coreboot utils default x_ ./update vendor download ${board} } |