From 7842113c1d43b9124919bb79b76746f74a5f33c7 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Wed, 21 Dec 2022 17:13:25 +0100 Subject: [PATCH] armbian-next: make sure at least one board config file is sourced, otherwise misspell `BOARD=` is hard to find --- lib/functions/main/config-prepare.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/functions/main/config-prepare.sh b/lib/functions/main/config-prepare.sh index 08a28c20c..d2d7a47a8 100644 --- a/lib/functions/main/config-prepare.sh +++ b/lib/functions/main/config-prepare.sh @@ -47,11 +47,16 @@ function prepare_and_config_main_build_single() { BOARD_TYPE="${dict_all_board_types["${BOARD}"]}" BOARD_SOURCE_FILES="${dict_all_board_source_files["${BOARD}"]}" + declare -a sourced_board_configs=() for BOARD_SOURCE_FILE in ${BOARD_SOURCE_FILES}; do # No quotes, so expand the space-delimited list display_alert "Sourcing board configuration" "${BOARD_SOURCE_FILE}" "info" # shellcheck source=/dev/null source "${BOARD_SOURCE_FILE}" + sourced_board_configs+=("${BOARD_SOURCE_FILE}") done + + # Sanity check: if no board config was sourced, then the board name is invalid + [[ ${#sourced_board_configs[@]} -eq 0 ]] && exit_with_error "No such BOARD '${BOARD}'; no board config file found." LINUXFAMILY="${BOARDFAMILY}" # @TODO: wtf? why? this is (100%?) rewritten by family config! # this sourced the board config. do_main_configuration will source the family file. @@ -61,7 +66,7 @@ function prepare_and_config_main_build_single() { declare -g -r PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD}" declare -g -r PACKAGE_LIST_BOARD_REMOVE="${PACKAGE_LIST_BOARD_REMOVE}" - [[ -z $KERNEL_TARGET ]] && exit_with_error "Board configuration does not define valid kernel config" + [[ -z $KERNEL_TARGET ]] && exit_with_error "Board ('${BOARD}') configuration does not define valid kernel config" interactive_config_ask_branch [[ -z $BRANCH ]] && exit_with_error "No kernel branch selected: BRANCH"