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

rom.sh: tidy up error handling 

same as the last change

Signed-off-by: Leah Rowe <leah@libreboot.org>
25.04_branch
Leah Rowe 2025-04-12 22:19:44 +01:00
parent 7bd9fb9a7b
commit caaaf46540
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/rom.sh
View File

@ -63,13 +63,12 @@ mkpayload_grub()
eval "`setvars "" grub_modules grub_install_modules`" eval "`setvars "" grub_modules grub_install_modules`"
$dry eval "`setcfg "$grubdata/module/$tree"`" $dry eval "`setcfg "$grubdata/module/$tree"`"
$dry x_ rm -f "$srcdir/grub.elf"; $dry \ $dry x_ rm -f "$srcdir/grub.elf"; $dry \
"$srcdir/grub-mkstandalone" --grub-mkimage="$srcdir/grub-mkimage" \ x_ "$srcdir/grub-mkstandalone" --grub-mkimage="$srcdir/grub-mkimage" \
-O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \ -O i386-coreboot -o "$srcdir/grub.elf" -d "${srcdir}/grub-core/" \
--fonts= --themes= --locales= --modules="$grub_modules" \ --fonts= --themes= --locales= --modules="$grub_modules" \
--install-modules="$grub_install_modules" \ --install-modules="$grub_install_modules" \
"/boot/grub/grub_default.cfg=${srcdir}/.config" \ "/boot/grub/grub_default.cfg=${srcdir}/.config" \
"/boot/grub/grub.cfg=$grubdata/memdisk.cfg" || \ "/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; :
$err "$tree: cannot build grub.elf"; :
} }
mkvendorfiles() mkvendorfiles()