From 7c4e1054f4996bf13bc4f7f87d043b65137942ef Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Wed, 12 Feb 2025 09:41:46 +0100
Subject: [PATCH] fix: read BASE_BOARD from config before generate
 EXTRA_BOARD_CONFIG

---
 src/build | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/build b/src/build
index 8822486e..49a0e371 100755
--- a/src/build
+++ b/src/build
@@ -9,7 +9,21 @@ set -x
 define(){ IFS='\n' read -r -d '' ${1} || true; }
 
 define SCRIPT <<'EOF'
-BUILD_SCRIPT_PATH=$(dirname $(realpath -s $BASH_SOURCE))
+CUSTOM_OS_PATH=$(dirname $(realpath -s $0))
+CONFIG_FILE="${CUSTOM_PI_OS_PATH}/config"
+
+if [ -f "$CONFIG_FILE" ]; then
+    BASE_BOARD_FROM_CONFIG=$(bash -c "source \"$CONFIG_FILE\" >/dev/null 2>&1; echo \$BASE_BOARD")
+    if [ -n "$BASE_BOARD_FROM_CONFIG" ]; then
+        export BASE_BOARD="$BASE_BOARD_FROM_CONFIG"
+        echo "BASE_BOARD set to ${BASE_BOARD} from ${CONFIG_FILE} before generating board config."
+    else
+        echo "BASE_BOARD not found in ${CONFIG_FILE}."
+    fi
+else
+    echo "Config file ${CONFIG_FILE} does not exist."
+fi
+
 export EXTRA_BOARD_CONFIG=$(mktemp)
 ${BUILD_SCRIPT_PATH}/custompios_core/generate_board_config.py "${EXTRA_BOARD_CONFIG}"
 echo "Temp source file: ${EXTRA_BOARD_CONFIG}"
@@ -17,8 +31,6 @@ echo "Temp source file: ${EXTRA_BOARD_CONFIG}"
 source ${BUILD_SCRIPT_PATH}/common.sh
 install_cleanup_trap
 
-CUSTOM_OS_PATH=$(dirname $(realpath -s $0))
-
 source ${CUSTOM_PI_OS_PATH}/config "${1}" "${EXTRA_BOARD_CONFIG}" ${@}
 ${CUSTOM_PI_OS_PATH}/config_sanity