Skip to content

fix: read BASE_BOARD from config before generate EXTRA_BOARD_CONFIG #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

fix: read BASE_BOARD from config before generate EXTRA_BOARD_CONFIG #247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,28 @@ 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}"

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

Expand Down