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.

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

Conversation

meteyou
Copy link
Contributor

@meteyou meteyou commented Feb 12, 2025

This PR fix the generate EXTRA_BOARD_CONFIG, because this was generated before CustomPiOS reads the config file. This is needed to build images which are not armhf, because generate_board_config.py has a fallback to raspberrypi os 32 bit with armhf, this override the BASE_ARCH with the EXTRA_BOARD_CONFIG.

This PR is based of the discussion from #240 and fixes #239

@guysoft
Copy link
Owner

guysoft commented Feb 21, 2025

Yes this looks like a better solution to this than #240
Will test on my end, and merge.

@jxmx Does this solve your issue in #240 ?

@guysoft
Copy link
Owner

guysoft commented Feb 21, 2025

Getting with this

 + tee build.log
 ++++ realpath -s /CustomPiOS/build
 +++ dirname /CustomPiOS/build
 ++ CUSTOM_OS_PATH=/CustomPiOS
 ++ CONFIG_FILE=/CustomPiOS/config
 ++ '[' -f /CustomPiOS/config ']'
 +++ bash -c 'source "/CustomPiOS/config" >/dev/null 2>&1; echo $BASE_BOARD'
 ++ BASE_BOARD_FROM_CONFIG=raspberrypiarmhf
 ++ '[' -n raspberrypiarmhf ']'
 ++ export BASE_BOARD=raspberrypiarmhf
 ++ BASE_BOARD=raspberrypiarmhf
 ++ echo 'BASE_BOARD set to raspberrypiarmhf from /CustomPiOS/config before generating board config.'
 BASE_BOARD set to raspberrypiarmhf from /CustomPiOS/config before generating board config.
 +++ mktemp
 ++ export EXTRA_BOARD_CONFIG=/tmp/tmp.zu4QyU1lSZ
 ++ EXTRA_BOARD_CONFIG=/tmp/tmp.zu4QyU1lSZ
 ++ /custompios_core/generate_board_config.py /tmp/tmp.zu4QyU1lSZ
 /CustomPiOS/build: line 59: /custompios_core/generate_board_config.py: No such file or directory
 + exit 1
 + chmod 777 /mnt/sda1/PleromaPi/src/workspace /mnt/sda1/PleromaPi/src/workspace-raspios_lite_arm64

Need to investigate more. Looks like its picking up the config file in CustomPiOS and not the config file in the distribution file

@guysoft
Copy link
Owner

guysoft commented Feb 22, 2025

Nope, on second thought #240 is better, its importing the correct distro config path and not custompios path

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BASE_ARCH=aarch64 is Ignored
2 participants