libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

roms: don't use x_ to call cproms() 

cproms() never returns non-zero, so it doesn't make
sense to use x_ here

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit6-merge1
Leah Rowe 2024-06-16 17:56:41 +01:00
parent bc853fbb89
commit 58a451865b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/roms
View File

@ -219,7 +219,7 @@ build_seabios_roms()
newrom="$romdir/seabios_${board}_${initmode}_$displaymode" newrom="$romdir/seabios_${board}_${initmode}_$displaymode"
[ "$initmode" = "normal" ] && newrom="$romdir/seabios" \ [ "$initmode" = "normal" ] && newrom="$romdir/seabios" \
&& newrom="${newrom}_${board}_$initmode" && newrom="${newrom}_${board}_$initmode"
x_ cprom cp "$t" "$newrom.rom" cprom cp "$t" "$newrom.rom"
fi fi
x_ rm -f "$t" x_ rm -f "$t"
} }
@ -256,15 +256,15 @@ build_grub_roms()
newrom="$romdir/${payload1}_${board}_${initmode}_$displaymode.rom" newrom="$romdir/${payload1}_${board}_${initmode}_$displaymode.rom"
[ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \ [ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \
&& newrom="$newrom${board}_$initmode.rom" && newrom="$newrom${board}_$initmode.rom"
x_ cprom cp "$tmprom" "$newrom" cprom cp "$tmprom" "$newrom"
if [ "$payload_seabios_withgrub" = "y" ] && \ if [ "$payload_seabios_withgrub" = "y" ] && \
[ "$payload1" != "grub" ]; then [ "$payload1" != "grub" ]; then
cbfs "$tmprom" "$grubdata/bootorder" bootorder raw cbfs "$tmprom" "$grubdata/bootorder" bootorder raw
x_ cprom cp "$tmprom" "${newrom%.rom}_grubfirst.rom" cprom cp "$tmprom" "${newrom%.rom}_grubfirst.rom"
if [ "$payload_seabios_grubonly" = "y" ]; then if [ "$payload_seabios_grubonly" = "y" ]; then
x_ "$cbfstool" "$tmprom" add-int -i 0 \ x_ "$cbfstool" "$tmprom" add-int -i 0 \
-n etc/show-boot-menu -n etc/show-boot-menu
x_ cprom cp "$tmprom" "${newrom%.rom}_grubonly.rom" cprom cp "$tmprom" "${newrom%.rom}_grubonly.rom"
fi fi
fi fi
} }
@ -293,7 +293,7 @@ build_uboot_roms()
newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom" newrom="$romdir/uboot_payload_${board}_${initmode}_$displaymode.rom"
x_ cp "$cbrom" "$tmprom" x_ cp "$cbrom" "$tmprom"
cbfs "$tmprom" "$ubootelf" "fallback/payload" cbfs "$tmprom" "$ubootelf" "fallback/payload"
x_ cprom mv "$tmprom" "$newrom" cprom mv "$tmprom" "$newrom"
} }
cprom() cprom()