mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-17 08:40:14 +02:00
rom.sh: reduce indendation in check_coreboot_utils
call it via fx_, instead of using a for loop Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
+16
-18
@@ -44,7 +44,7 @@ mkpayload_grub()
|
|||||||
mkvendorfiles()
|
mkvendorfiles()
|
||||||
{
|
{
|
||||||
[ -z "$mode" ] && $dry cook_coreboot_config
|
[ -z "$mode" ] && $dry cook_coreboot_config
|
||||||
check_coreboot_utils "$tree"
|
fx_ check_coreboot_util printf "cbfstool\nifdtool\n"
|
||||||
printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \
|
printf "%s\n" "${version%%-*}" > "$srcdir/.coreboot-version" || \
|
||||||
err "!mk $srcdir .coreboot-version"
|
err "!mk $srcdir .coreboot-version"
|
||||||
[ -z "$mode" ] && [ "$target" != "$tree" ] && \
|
[ -z "$mode" ] && [ "$target" != "$tree" ] && \
|
||||||
@@ -59,26 +59,24 @@ cook_coreboot_config()
|
|||||||
make -C "$srcdir" oldconfig || err "Could not cook $srcdir/.config"; :
|
make -C "$srcdir" oldconfig || err "Could not cook $srcdir/.config"; :
|
||||||
}
|
}
|
||||||
|
|
||||||
check_coreboot_utils()
|
check_coreboot_util()
|
||||||
{
|
{
|
||||||
for util in cbfstool ifdtool; do
|
[ "$badhash" = "y" ] && x_ rm -f "elf/$1/$tree/$1"
|
||||||
[ "$badhash" = "y" ] && x_ rm -f "elf/$util/$1/$util"
|
e "elf/$1/$tree/$1" f && return 0
|
||||||
e "elf/$util/$1/$util" f && continue
|
|
||||||
|
|
||||||
utilelfdir="elf/$util/$1"
|
utilelfdir="elf/$1/$tree"
|
||||||
utilsrcdir="src/coreboot/$1/util/$util"
|
utilsrcdir="src/coreboot/$tree/util/$1"
|
||||||
|
|
||||||
utilmode="" && [ -n "$mode" ] && utilmode="clean"
|
utilmode="" && [ -n "$mode" ] && utilmode="clean"
|
||||||
x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $makeargs
|
x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $makeargs
|
||||||
if [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ]; then
|
[ -n "$mode" ] && x_ rm -Rf "$utilelfdir" && return 0
|
||||||
x_ mkdir -p "$utilelfdir"
|
[ -z "$mode" ] || return 0
|
||||||
x_ cp "$utilsrcdir/$util" "$utilelfdir"
|
[ -f "$utilelfdir/$1" ] && return 0
|
||||||
[ "$util" = "cbfstool" ] || continue
|
|
||||||
x_ cp "$utilsrcdir/rmodtool" "$utilelfdir"
|
x_ mkdir -p "$utilelfdir"
|
||||||
elif [ -n "$mode" ]; then
|
x_ cp "$utilsrcdir/$1" "$utilelfdir"
|
||||||
x_ rm -Rf "$utilelfdir"
|
[ "$1" = "cbfstool" ] || return 0
|
||||||
fi; :
|
x_ cp "$utilsrcdir/rmodtool" "$utilelfdir"
|
||||||
done; :
|
|
||||||
}
|
}
|
||||||
|
|
||||||
mkcorebootbin()
|
mkcorebootbin()
|
||||||
|
|||||||
Reference in New Issue
Block a user