[v3.6-branch] cmake: modules: extensions: Fix missing board revision overlays #71212
Conversation
nordicjm
force-pushed
the
fixmissingoverlay
branch
from
19d161e to
31585f7
Compare
nordicjm
force-pushed
the
fixmissingoverlay
branch
2 times, most recently
from
9517cbe to
6ebb408
Compare
| cmake_parse_arguments(FILE "${options}" "${single_args}" "${multi_args}" ${ARGN}) | ||
| if(FILE_UNPARSED_ARGUMENTS) | ||
| message(FATAL_ERROR "zephyr_file(${ARGV0} <val> ...) given unknown arguments: ${FILE_UNPARSED_ARGUMENTS}") | ||
| cmake_parse_arguments(ZFILE "${options}" "${single_args}" "${multi_args}" ${ARGN}) |
There was a problem hiding this comment.
Instead of creating a new commit with combination of multiple commits, then I believe the proper way is to actually do a cherry-pick of needed commits from zephyr/main.
That will both make it easier to identify identical changes / commits between branches, as well as help identifying cases where some commits might have been forgotten.
In this case it appears to me that the changes in 6ebb408921c535c45ca4c31b9ded672a0dae456c lacks the fixes from 3cff550, and hence while trying to fix #71203 you introduce a new error.
Please cherry-pick relevant commits instead, which seems to be the following:
50f0454
3cff550
0301305 (from PR #71280)
There was a problem hiding this comment.
It is not cherry-picked because it does not apply, the changes in those linked commits use MERGE functions which are not in 3.6
There was a problem hiding this comment.
I know it's not cherry-picked but you can still cherry-pick and during conflict resolving you'll get the chance to adjust the commit wrt. the MERGE functionality and the board qualifiers.
And the -x makes it even easier to see the origin of the fix.
End result in code should of course be identical to re-implementing the changes, but making it much easier to trace which fixes from main that has been applied in the branch.
Fixes an issue whereby board overlays for board revisions were not included when configuring applications Signed-off-by: Jamie McCrae <[email protected]>
Renames prefixes in some functions to avoid clashes with global variables that have the same name Signed-off-by: Jamie McCrae <[email protected]>
for Kconfig fragments in the `boards` application subdirectory. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 3cff550)
nordicjm
force-pushed
the
fixmissingoverlay
branch
from
6ebb408 to
9f2f78b
Compare
|
Ping @henrikbrixandersen |
Fixes an issue whereby board overlays for board revisions were not included when configuring applications
Fixes #71203