Compose the default environment from multiple env* directories #93
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Prefer if/elif/else over nested if/else statements. Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
The barebox recipe currently supports only a single 'env' directory as the default environment, configured at compile time. But it can be convenient to split an environment into multiple directories to support various OVERRIDES, like per-distro or per-machine configuration. To do this, merge all env* directories in .defaultenv and set CONFIG_DEFAULT_ENVIRONMENT_PATH at configure time. Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
Set the CONFIG_EXTRA_FIRMWARE_DIR config entry with the value of BAREBOX_FIRMWARE_DIR at configure time, not compile time. At the same time, inconditionally merge a .firmware.cfg file to to simplify this configuration step. Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change allows to merge multiple env* directories to compose the default environment. That's particularly useful to split the barebox configuration into multiple directories added via OVERRIDES, like distro or machine specific scripts.
At the same time, move config related changes into the configure step and simplify it a bit.