canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

roms: build coreboot *after* checking variables 

otherwise, release=n is ignored and an image is built in
the elf/ directory, even if it's still skipped for bin/

avoid doing unnecessary work per-release by checking the
variables before building coreboot via script/trees

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2
Leah Rowe 2024-06-25 09:54:22 +01:00 committed by Leah Rowe
parent aac8720382
commit e8b7e74db5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
script/roms
View File

@ -93,12 +93,13 @@ configure_target()
# Override the above defaults using target.cfg # Override the above defaults using target.cfg
eval `setcfg "$targetdir/target.cfg"` eval `setcfg "$targetdir/target.cfg"`
x_ ./update trees -b coreboot $board
[ -z "$tree" ] && $err "$board: tree not defined" [ -z "$tree" ] && $err "$board: tree not defined"
[ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1 [ "$XBMK_RELEASE" = "y" ] && [ "$release" = "n" ] && return 1
[ "$board" = "$tree" ] && return 1 [ "$board" = "$tree" ] && return 1
x_ ./update trees -b coreboot $board
cbdir="src/coreboot/$tree" cbdir="src/coreboot/$tree"
cbfstool="elf/cbfstool/$tree/cbfstool" cbfstool="elf/cbfstool/$tree/cbfstool"
[ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree [ -f "$cbfstool" ] || x_ ./update trees -b coreboot utils $tree