download/coreboot: split config check to function

fsdg20230625
Leah Rowe 2023-05-15 01:07:32 +01:00
parent 62038f1d03
commit a33e5c67f3
1 changed files with 17 additions and 16 deletions

View File

@ -78,31 +78,16 @@ download_for_board()
cbrevision="undefined" cbrevision="undefined"
cbtree="undefined" cbtree="undefined"
if [ ! -f "resources/coreboot/${_board}/board.cfg" ]; then check_config_for_board "${_board}" || return 1
printf "ERROR: download/coreboot: board.cfg does not"
printf " exist for '%s'\n" ${_board}
return 1
fi
if [ -f "resources/coreboot/${_board}/seen" ]; then
printf "ERROR: download/coreboot: logical loop:"
printf " '%s' board.cfg refers to another tree," \
${_board}
printf " which ultimately refers back to '%s'." \
${_board}
return 1
fi
# This is to override $cbrevision and $cbtree # This is to override $cbrevision and $cbtree
. "resources/coreboot/${_board}/board.cfg" \ . "resources/coreboot/${_board}/board.cfg" \
|| touch ../build_error || touch ../build_error
if [ -f build_error ]; then if [ -f build_error ]; then
printf "ERROR: download/coreboot:" printf "ERROR: download/coreboot:"
printf " problem sourcing %s/board.cfg\n" ${_board} printf " problem sourcing %s/board.cfg\n" ${_board}
return 1 return 1
fi fi
touch "resources/coreboot/${_board}/seen"
if [ "${_board}" != "${cbtree}" ]; then if [ "${_board}" != "${cbtree}" ]; then
_board="${cbtree}" _board="${cbtree}"
@ -233,6 +218,22 @@ download_for_board()
fi fi
} }
check_config_for_board()
{
if [ ! -f "resources/coreboot/${1}/board.cfg" ]; then
printf "ERROR: download/coreboot: board.cfg does not"
printf " exist for '%s'\n" ${1}
return 1
elif [ -f "resources/coreboot/${1}/seen" ]; then
printf "ERROR: download/coreboot: logical loop:"
printf " '%s' board.cfg refers to another tree," ${1}
printf " which ultimately refers back to '%s'." ${1}
return 1
fi
touch "resources/coreboot/${1}/seen"
return 0
}
usage() usage()
{ {
progname="./download coreboot" progname="./download coreboot"