kbuild: merge config fragments from the kernel source tree - #3225
Closed
bhcopeland wants to merge 1 commit into
Closed
bhcopeland wants to merge 1 commit into
bhcopeland wants to merge 1 commit into
Conversation
A fragment can only carry config symbols or a make target, so a job that needs the options a subsystem's selftests declare has to either run 'make kselftest-merge', which merges every selftest config and brings in lockdep, DEBUG_PAGEALLOC and the rest, or copy that one config file into fragments.yaml, where it goes stale as the kernel's copy changes. Accept a 'tree:<path>' entry naming a config fragment file in the kernel source tree, such as 'tree:tools/testing/selftests/arm64/config', and merge it as each tree ships it. The make backend merges it with merge_config.sh from inside the tree; tuxmake is given its path in the tree. The path is written into the build script unquoted, so one that is empty, absolute, lexically outside the tree or holding anything but letters, digits, '.', '_', '-' and '/' fails the job. When a tree does not ship the file its merge is skipped with a message, and the build continues: tools/testing/selftests/arm64/config first appears in v7.3-rc1, and the same fragment is built for stable branches that predate it. The check happens when the script runs, since the tree is only unpacked then. Signed-off-by: Ben Copeland <ben.copeland@linaro.org>
Member
Author
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
1 participant
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.
A fragment can only carry config symbols or a make target, so a job that needs the options a subsystem's selftests declare has to either run 'make kselftest-merge', which merges every selftest config and brings in lockdep, DEBUG_PAGEALLOC and the rest, or copy that one config file into fragments.yaml, where it goes stale as the kernel's copy changes.
Accept a 'tree:' entry naming a config fragment file in the kernel source tree, such as 'tree:tools/testing/selftests/arm64/config', and merge it as each tree ships it. The make backend merges it with merge_config.sh from inside the tree; tuxmake is given its path in the tree. The path is written into the build script unquoted, so one that is empty, absolute, lexically outside the tree or holding anything but letters, digits, '.', '_', '-' and '/' fails the job.
When a tree does not ship the file its merge is skipped with a message, and the build continues: tools/testing/selftests/arm64/config first appears in v7.3-rc1, and the same fragment is built for stable branches that predate it. The check happens when the script runs, since the tree is only unpacked then.