diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/git.sh | 5 | ||||
| -rw-r--r-- | include/rom.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/git.sh b/include/git.sh index 27b79c1a..0de4c931 100644 --- a/include/git.sh +++ b/include/git.sh @@ -2,7 +2,7 @@ # Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org> # Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com> -eval `setvars "" loc url bkup_url subfile mdir subhash subrepo subrepo_bkup \ +eval `setvars "" loc url bkup_url subfile subhash subrepo subrepo_bkup \ depend subfile_bkup` fetch_targets() @@ -69,9 +69,6 @@ git_prep() prep_submodules() { - mdir="$PWD/config/submodule/$project" - [ -n "$tree" ] && mdir="$mdir/$tree" - [ -f "$mdir/module.list" ] && while read -r msrcdir; do fetch_submodule "$msrcdir" done < "$mdir/module.list"; return 0 diff --git a/include/rom.sh b/include/rom.sh index 574b1b6c..8798ef13 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -53,6 +53,8 @@ mkvendorfiles() check_coreboot_utils() { for util in cbfstool ifdtool; do + [ "$badhash" = "n" ] || rm -f "elf/$util/$1/$util" || \ + $err "!rm badelf elf/$util/$1/$util" e "elf/$util/$1/$util" f && continue utilelfdir="elf/$util/$1" |