diff options
| author | Leah Rowe <leah@libreboot.org> | 2025-04-12 22:19:44 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2025-04-12 22:32:51 +0100 |
| commit | cb3253befb9e3424ff009e3f4c894b1609dc3db0 (patch) | |
| tree | bce783aade6f704c82da632ebbde0319cd09f73b /include | |
| parent | 7af46721bcbd3f864d76da7f14a5c44586294d37 (diff) | |
rom.sh: tidy up error handling
same as the last change
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/rom.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/rom.sh b/include/rom.sh index f2609bba..7e2271f1 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -63,13 +63,12 @@ mkpayload_grub() eval "`setvars "" grub_modules grub_install_modules`" $dry eval "`setcfg "$grubdata/module/$tree"`" $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/" \ --fonts= --themes= --locales= --modules="$grub_modules" \ --install-modules="$grub_install_modules" \ "/boot/grub/grub_default.cfg=${srcdir}/.config" \ - "/boot/grub/grub.cfg=$grubdata/memdisk.cfg" || \ - $err "$tree: cannot build grub.elf"; : + "/boot/grub/grub.cfg=$grubdata/memdisk.cfg"; : } mkvendorfiles() @@ -285,6 +284,5 @@ mkcoreboottar() [ "$XBMK_RELEASE" = "y" ] || return 0 [ "$release" != "n" ] || return 0 $dry mkrom_tarball "bin/$target" - $dry ./mk inject "bin/${relname}_${target}.tar.xz" nuke || \ - $err "Can't nuke vendorfiles in 'bin/${relname}_$target.tar.xz'"; : + $dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; : } |