canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

roms: make grubfirst if seabios_withgrub=y 

rather than if seabios_grubonly=y

if grubonly=y, still make the grubonly rom

this complements the previous commit

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2-merge1
Leah Rowe 2024-05-27 14:42:16 +01:00 committed by Leah Rowe
parent fca9b19e18
commit 9f489b43d5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
script/roms
View File

@ -356,13 +356,16 @@ build_grub_roms()
[ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \ [ "$initmode" = "normal" ] && newrom="$romdir/${payload1}_" \
&& newrom="$newrom${board}_${initmode}_$keymap.rom" && newrom="$newrom${board}_${initmode}_$keymap.rom"
x_ cprom "$tmpgrubrom" "$newrom" x_ cprom "$tmpgrubrom" "$newrom"
if [ "$payload_seabios_grubonly" = "y" ]; then if [ "$payload_seabios_withgrub" = "y" ]; then
x_ "$cbfstool" "$tmpgrubrom" add \ x_ "$cbfstool" "$tmpgrubrom" add \
-f "config/grub/bootorder" -n bootorder -t raw -f "config/grub/bootorder" -n bootorder -t raw
x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom" x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom"
x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \ if [ "$payload_seabios_grubonly" = "y" ]; then
-n etc/show-boot-menu x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \
x_ cprom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom" -n etc/show-boot-menu
x_ cprom "$tmpgrubrom" \
"${newrom%.rom}_grubonly.rom"
fi
fi fi
x_ rm -f "$tmpgrubrom" x_ rm -f "$tmpgrubrom"
done done