coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-13 14:59:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

rom.sh: minor cleanup

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-04-12 17:29:35 +01:00
parent cb36248c8c
commit c158d82298
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rom.sh
+8 -11
View File
@@ -41,9 +41,8 @@ mkpicotool()
rm -Rf "$picotool" || $err "Can't remove picotool builddir" rm -Rf "$picotool" || $err "Can't remove picotool builddir"
( (
x_ cd src/picotool x_ cd src/picotool
cmake -DCMAKE_INSTALL_PREFIX=xbmkbin -DPICOTOOL_FLAT_INSTALL=1 \ x_ cmake -DCMAKE_INSTALL_PREFIX=xbmkbin -DPICOTOOL_FLAT_INSTALL=1 \
-DPICO_SDK_PATH=../pico-sdk || \ -DPICO_SDK_PATH=../pico-sdk
$err "Can't prep picotool"
make install || $err "Can't build picotool"; : make install || $err "Can't build picotool"; :
) || $err "Can't build picotool"; : ) || $err "Can't build picotool"; :
} }
@@ -160,7 +159,8 @@ mkcorebootbin()
$dry add_seabios $dry add_seabios
[ "$payload_uboot" = "y" ] && pname="uboot" && $dry add_uboot [ "$payload_uboot" = "y" ] && pname="uboot" && $dry add_uboot
else else
pname="custom" && $dry cprom; : pname="custom"
$dry cprom
fi; : fi; :
} }
@@ -212,11 +212,9 @@ add_grub()
mkseagrub() mkseagrub()
{ {
if [ "$payload_grubsea" = "y" ]; then [ "$payload_grubsea" = "y" ] && pname="grub"
pname="grub" [ "$payload_grubsea" = "y" ] || \
else cbfs "$tmprom" "$grubdata/bootorder" bootorder raw
cbfs "$tmprom" "$grubdata/bootorder" bootorder raw
fi
for keymap in config/data/grub/keymap/*.gkb; do for keymap in config/data/grub/keymap/*.gkb; do
[ -f "$keymap" ] && cprom "${keymap##*/}"; : [ -f "$keymap" ] && cprom "${keymap##*/}"; :
done; : done; :
@@ -288,6 +286,5 @@ mkcoreboottar()
[ "$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 ./mk inject "bin/${relname}_${target}.tar.xz" nuke || \
$err "Can't delete vendorfiles in 'bin/${relname}_$target.tar.xz'" $err "Can't nuke vendorfiles in 'bin/${relname}_$target.tar.xz'"; :
return 0
} }