-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build: namespace generated headers with zephyr/
#63973
build: namespace generated headers with zephyr/
#63973
Conversation
784ca5e
to
fca0d73
Compare
d11cd32
to
6f4c80f
Compare
this PR is getting more involved than I initially expected EDIT:
zephyr/scripts/kconfig/kconfiglib.py Line 2931 in b272760
zephyr/scripts/kconfig/kconfiglib.py Line 4310 in b272760
zephyr/scripts/kconfig/kconfiglib.py Line 4448 in b272760
This is fixed in the last commit |
4c025dc
to
d0ab838
Compare
version.h
89a285d
to
5fb8545
Compare
zephyr/
message(WARNING " | ||
Warning: CONFIG_LEGACY_GENERATED_INCLUDE_PATH is currently enabled by default | ||
so that user applications can continue to use the legacy include paths for the | ||
generated headers. This Kconfig will be deprecated and eventually removed in | ||
the future releases.") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not fond of having such a warning enabled by default. This will be emitted on every build, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wait... there are other people who look at build warnings? @henrikbrixandersen, you and I should start a club!
I've seen Kconfig and Device tree warnings pretty much every time I build anything more complex than samples/hello_world/... neither of these tools seems to have any -Werror
, which in my experience is the only way to make anyone care.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The warning will be printed only for people who should fix their code ASAP so printing it every time looks good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise the CONFIG_LEGACY_GENERATED_INCLUDE_PATH
which is enabled by default now will just make everything passes silently. Most people might not notice that the headers are now relocated to zephyr/
unless they looked at their build directory or the migration guide.
On the other extreme, if we disable CONFIG_LEGACY_GENERATED_INCLUDE_PATH
by default, the downstream apps will fail to build immediately, which I don't think is the right way to do in an OS of this scale.
The current implementation IMHO is the middle approach - we don't want to break downstream applications, but at the same time we want to make sure that developers are made aware of the changes, and given enough time to do their migration (as we do ours - some of the PRs aren't merged, west.yml
not updated to point at them).
@cfriedt @nordicjm @finikorg @fabiobaltieri @de-nordic @dcpleung @mbolivar-ampere @gmarull this PR should align with #41543 and consistent with the header migration PR that you have done in the past (~v3.1.0?), could you please review? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes to nRF QSPI NOR look ok.
This may use some coordination help from someone from @zephyrproject-rtos/release, plenty of dependencies, plus probably something will pop up after merge as well, worth keeping it in mind. |
ping assignee @tejlmand, PTAL, thanks! |
3570408
into
zephyrproject-rtos:main
🥳🍀🤞 |
Just FYI https://github.com/thesofproject/sof/actions/runs/9278328176/job/25529164408
That's because one Python script in SOF extracts values from The C compilation was fine and the CONFIG_LEGACY_GENERATED_INCLUDE_PATH warning was printed by CMake as expected. Just FYI. |
PR zephyrproject-rtos#63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. Signed-off-by: Ben Marsh <[email protected]>
PR #63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. Signed-off-by: Ben Marsh <[email protected]>
PR zephyrproject-rtos#63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. Signed-off-by: Ben Marsh <[email protected]>
PR zephyrproject-rtos#63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. Signed-off-by: Ben Marsh <[email protected]>
PR zephyrproject-rtos#63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. Signed-off-by: Ben Marsh <[email protected]>
PR zephyrproject-rtos#63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. Signed-off-by: Ben Marsh <[email protected]>
PR zephyrproject-rtos#63973 namespaced generated headers with zephyr/, including generated syscall headers. Since then, some new generated syscall header includes have been added without the zephyr/ prefix, breaking builds when CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled. This commit adds the zephyr/ prefix to includes for generated syscall headers where it has been missed. (cherry picked from commit 74c871d) Original-Signed-off-by: Ben Marsh <[email protected]> GitOrigin-RevId: 74c871d Change-Id: I8e595ded94f2900d6c4bcc60ac078aa56f80f22d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/5702156 Commit-Queue: Keith Short <[email protected]> Tested-by: Keith Short <[email protected]> Reviewed-by: Keith Short <[email protected]> Tested-by: ChromeOS Prod (Robot) <[email protected]>
Namespaced the generated headers with
zephyr/
to prevent potential conflict with other headers.Introduced a Kconfig (
CONFIG_LEGACY_GENERATED_INCLUDE_PATH
) to support legacy generated header include paths in the mean time.Documentation preview
Fixes #60377
Fixes #68035
version.h
- take 1 thesofproject/sof#8459version.h
percepio/percepio#5version.h
percepio/percepio#6version.h
percepio#10autoconf.h
withzephyr/
hal_nxp#395autoconf.h
withzephyr/
lvgl#53zephyr/
mcu-tools/mcuboot#1965zephyr/
mcuboot#117Automation script:
Requirements for Treewide Changes