build_sdk: fix config overriding#563
Merged
Merged
Conversation
Previously duplicate config values would cause multiple `-DKernelOption` values being passed on the command line, and then it was up to CMake shenanigans for how this behaves, especially if they were incompatible options. Instead, merge the dictionaries and so later-options are more important. In order of priority, we have: - Common kernel options for all arches - The kernel arch option - Any common arch-specific kernel options - Board-specific kernel options Signed-off-by: Julia Vassiliki <julia.vassiliki@unsw.edu.au>
Instead of having defaults for each-board, the default is a global variabled merged into config_args when we build seL4 that takes priorities into account. Signed-off-by: Julia Vassiliki <julia.vassiliki@unsw.edu.au>
midnightveil
force-pushed
the
julia/fix-config-generation-order
branch
from
July 16, 2026 02:30
56936ab to
0462375
Compare
dreamliner787-9
approved these changes
Jul 16, 2026
This file contains hidden or 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
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.
Previously duplicate config values would cause multiple
-DKernelOptionvalues being passed on the command line,and then it was up to CMake shenanigans for how this behaves,
especially if they were incompatible options. Instead, merge
the dictionaries and so later-options are more important.
In order of priority, we have:
I tested that this makes no changes to the configurations that were build by building the two SDKs, running this script, and then diffing the output, which reported no diffs (that weren't reorderings or different paths)