splatink/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-03-25 13:29:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

rom.sh/tree.sh: clean up if_not_dry_build

Browse Source 
the way it was used is messy, and a relic of the
old chained command coding style, from before when
i recently loosened that requirement.

the new focus is simple, readable code, regardless
of size.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-10-06 13:28:34 +01:00
parent 1b54c7a744
commit 8636d7497c
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/rom.sh
View File

@@ -233,26 +233,25 @@ mkcorebootbin_real()
payload_grubsea="n"
fi
$if_dry_build \
return 0
if [ -f "$cbfscfg" ]; then
$if_not_dry_build \
dx_ add_cbfs_option "$cbfscfg"
dx_ add_cbfs_option "$cbfscfg"
fi
if $if_not_dry_build grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then
if grep "CONFIG_PAYLOAD_NONE=y" "$defconfig"; then
if [ "$payload_seabios" = "y" ]; then
pname="seabios"
$if_not_dry_build \
add_seabios
add_seabios
fi
if [ "$payload_uboot" = "arm64" ]; then
pname="uboot"
$if_not_dry_build \
add_uboot
add_uboot
fi
else
pname="custom"
$if_not_dry_build \
cprom
cprom
fi; :
}
@@ -502,13 +501,14 @@ cbfs()
mkcoreboottar()
{
if [ "$target" != "$tree" ] && [ "$XBMK_RELEASE" = "y" ] && \
[ "$release" != "n" ]; then
$if_dry_build \
return 0
$if_not_dry_build \
mkrom_tarball "bin/$target"
$if_not_dry_build \
x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke
if [ "$target" = "$tree" ] || [ "$XBMK_RELEASE" != "y" ] || \
[ "$release" = "n" ]; then
return 0
fi
mkrom_tarball "bin/$target"
x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke
}

34
include/tree.sh
View File

@@ -240,9 +240,10 @@ handle_defconfig()
if [ -z "$mode" ]; then
for _xarch in $xarch; do
$if_dry_build \
break
if [ -n "$_xarch" ]; then
$if_not_dry_build \
check_cross_compiler "$_xarch"
check_cross_compiler "$_xarch"
fi
done; :
fi
@@ -629,7 +630,9 @@ check_defconfig()
# skip build if a previous one exists:
if ! $if_not_dry_build elfcheck; then
$if_dry_build \
return 0
if ! elfcheck; then
return 1
fi
}
@@ -701,25 +704,26 @@ run_make_command()
fi
if [ "$mode" = "clean" ]; then
$if_not_dry_build \
make -C "$srcdir" $cleanargs distclean || \
$if_not_dry_build \
x_ make -C "$srcdir" $cleanargs clean; :
$if_dry_build \
return 0
if ! make -C "$srcdir" $cleanargs distclean; then
x_ make -C "$srcdir" $cleanargs clean
fi
fi
}
check_cmake()
{
if [ -n "$cmakedir" ]; then
if ! $if_not_dry_build check_makefile "$1"; then
if ! cmake -B "$1" "$1/$cmakedir"; then
$if_not_dry_build \
x_ check_makefile "$1"
fi
$if_dry_build \
return 0
if [ ! -n "$cmakedir" ]; then
return 0
elif ! check_makefile "$1"; then
if ! cmake -B "$1" "$1/$cmakedir"; then
x_ check_makefile "$1"
fi
$if_not_dry_build \
x_ check_makefile "$1"; :
fi
x_ check_makefile "$1"; :
}
check_autoconf()