diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-07-22 19:34:19 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-07-22 19:34:19 +0100 |
| commit | faefcdf3df382bf0b7f0a1a6c6531406fb652d46 (patch) | |
| tree | 8dfd41427fc66a8f3c2b40124c9ef54c1f490662 /include/rom.sh | |
| parent | 40dd0a7cf35fe75e3e2ac14eecec256d918f33bc (diff) | |
rom.sh: fix buggy deletion of cbutils
when badhash=y, the utils should be deleted, but
the check is deleting if badhash isn't n. if the
hash check isn't being performed, then this will
always be the case and the utils are always deleted.
make it positively delete the file only if badhash=y,
not when it isn't n. while this may not sound very
different, it will prevent the utils being deleted and
re-build endlessly in other cases, like when building
release archives and running the inject --nuke mode
on every image that gets built.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include/rom.sh')
| -rw-r--r-- | include/rom.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/rom.sh b/include/rom.sh index 21d7e3d9..6f914009 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -62,8 +62,7 @@ cook_coreboot_config() check_coreboot_utils() { for util in cbfstool ifdtool; do - [ "$badhash" = "n" ] || rm -f "elf/$util/$1/$util" || \ - $err "!rm badelf elf/$util/$1/$util" + [ "$badhash" = "y" ] && x_ rm -f "elf/$util/$1/$util" e "elf/$util/$1/$util" f && continue utilelfdir="elf/$util/$1" |