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>
This commit is contained in:
Leah Rowe
2024-07-22 19:34:19 +01:00
parent 40dd0a7cf3
commit faefcdf3df

View File

@@ -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"