Skip to content

Conversation

@gregshue
Copy link

Support referencing module directories by name in CONF_FILE,
OVERLAY_CONFIG, and DTC_OVERLAY_FILE so that projects can reference
overlay files in arbitrary modules.

Fixes #41830

Signed-off-by: Gregory Shue [email protected]

@gregshue
Copy link
Author

Updated version of automatically closed PR #42057

de-nordic
de-nordic previously approved these changes Jul 22, 2022
Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please push the correct and approved version.

Current version is older with unaddressed comments.

Copy link
Contributor

@tejlmand tejlmand Aug 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please push the correct version ?

This is old version where changes was requested here:
#42057 (comment)

note you most likely need to manually expand collapsed comments in github for the link to take you to the right comment.
Old comment copy:

Looking at the rendered output, I feel this particular feature fills to much, compared to the description of the other parts:
image

How about just a short mentioning of this possibility, for example:

Suggested change
set(CONF_FILE "\${ZEPHYR_MODULENAME_MODULE_DIR}/<module-relative-pathname>")
``DTC_OVERLAY_FILE``. A file in a Zephyr module can be referred by escaping the Zephyr module dir variable like this ``\${ZEPHYR_<module>_MODULE_DIR}/<path-to>/<file>`` when setting any of said variables.

@gregshue gregshue force-pushed the 41830-expand-parsing-of-CONF_FILE-OVERLAY_CONFIG branch from 3f03fb4 to 1d09a68 Compare August 2, 2022 12:59
@zephyrbot zephyrbot requested a review from jeremybettis August 2, 2022 13:00
@gregshue gregshue force-pushed the 41830-expand-parsing-of-CONF_FILE-OVERLAY_CONFIG branch from 1d09a68 to 4044e04 Compare August 2, 2022 15:00
@gregshue
Copy link
Author

gregshue commented Aug 2, 2022

@tejlmand Thank you for pointing out my mistake. I have corrected the changes that I could map to the current files. Some of the relevant documentation has been restructured. I will need some guidance on further documentation updates.

@gregshue gregshue requested review from de-nordic and tejlmand August 5, 2022 21:45
tejlmand
tejlmand previously approved these changes Sep 8, 2022
Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

de-nordic
de-nordic previously approved these changes Sep 14, 2022
@mbolivar-nordic mbolivar-nordic added this to the v3.3.0 milestone Sep 14, 2022
@gregshue gregshue dismissed stale reviews from de-nordic, mbolivar-nordic, and tejlmand via d99c90d October 12, 2022 22:46
@gregshue gregshue force-pushed the 41830-expand-parsing-of-CONF_FILE-OVERLAY_CONFIG branch from 4044e04 to d99c90d Compare October 12, 2022 22:46
@gregshue
Copy link
Author

Rebased, updated test source to new ZTest API.

Support referencing module directories by name in CONF_FILE,
OVERLAY_CONFIG, and DTC_OVERLAY_FILE so that projects can reference
overlay files in arbitrary modules.

Verified by passing all the following tests:
  ./scripts/twister -T tests/cmake/overlays/

Fixes zephyrproject-rtos#41830

Signed-off-by: Gregory Shue <[email protected]>
@gregshue gregshue force-pushed the 41830-expand-parsing-of-CONF_FILE-OVERLAY_CONFIG branch from d99c90d to 2d3c4a6 Compare October 13, 2022 01:57
@mbolivar-nordic mbolivar-nordic merged commit cfcf630 into zephyrproject-rtos:main Oct 13, 2022
@gregshue gregshue deleted the 41830-expand-parsing-of-CONF_FILE-OVERLAY_CONFIG branch October 17, 2022 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CONF_FILE, OVERLAY_CONFIG parsing expands ${ZEPHYR_<whatever>_MODULE_DIR}

5 participants