coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-19 09:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

rom.sh: tidy up error handling

Browse Source 
same as the last change

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-04-12 22:19:44 +01:00
parent 7af46721bc
commit cb3253befb
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rom.sh
+3 -5
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()
@@ -285,6 +284,5 @@ mkcoreboottar()
[ "$XBMK_RELEASE" = "y" ] || return 0 [ "$XBMK_RELEASE" = "y" ] || return 0
[ "$release" != "n" ] || return 0 [ "$release" != "n" ] || return 0
$dry mkrom_tarball "bin/$target" $dry mkrom_tarball "bin/$target"
$dry ./mk inject "bin/${relname}_${target}.tar.xz" nuke || \ $dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; :
$err "Can't nuke vendorfiles in 'bin/${relname}_$target.tar.xz'"; :
} }