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/release | |
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/release')
-rwxr-xr-x | script/update/release/roms | 4 | ||||
-rwxr-xr-x | script/update/release/src | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/script/update/release/roms b/script/update/release/roms index c34762b0..0e2ab720 100755 --- a/script/update/release/roms +++ b/script/update/release/roms @@ -100,9 +100,9 @@ strip_archive() { romdir=${1} [ -d "src/coreboot/${tree}" ] || \ - x_ ./update project trees coreboot ${tree} + x_ ./update project trees -f coreboot ${tree} - x_ ./update project build -b coreboot utils ${tree} + x_ ./update project trees -b coreboot utils ${tree} if [ "${microcode_required}" = "n" ]; then for romfile in "${romdir}"/*.rom; do diff --git a/script/update/release/src b/script/update/release/src index b63994b5..d75ec170 100755 --- a/script/update/release/src +++ b/script/update/release/src @@ -44,11 +44,10 @@ create_release_directory() download_modules() { - for modname in ${trees_fetch_list}; do - [ -d "src/${modname}" ] || xx_ ./update project trees ${modname} - done - for modname in ${simple_fetch_list} ${download_only_list}; do - [ -d "src/${modname}/" ] || xx_ ./update project repo ${modname} + for modname in ${trees_fetch_list} ${simple_fetch_list} \ + ${download_only_list}; do + [ -d "src/${modname}/" ] || \ + xx_ ./update project trees -f ${modname} done } @@ -79,12 +78,12 @@ purge_files() ( xx_ cd "${srcdir}" [ ! -d "src/coreboot/default/util/kbc1126" ] || \ - xx_ ./update project build -c "src/coreboot/default/util/kbc1126" - xx_ ./update project build -x coreboot + xx_ ./update project trees -c "src/coreboot/default/util/kbc1126" + xx_ ./update project trees -x coreboot for p in u-boot seabios coreboot; do - xx_ ./update project build -c "${p}" + xx_ ./update project trees -c "${p}" done - xx_ ./update project build -c bios_extract flashrom grub uefitool \ + xx_ ./update project trees -c bios_extract flashrom grub uefitool \ stm32-vserprog stm32-vserprog/libopencm3 util/* memtest86plus xx_ rm -Rf .git */.git* */*/.git* */*/*/.git* */*/*/*/.git* \ |