Repository navigation
[libcpu] Make arm/Kconfig source optional in dist projects - #11995
Open
BernardXiong wants to merge 1 commit into
Open
BernardXiong wants to merge 1 commit into
BernardXiong wants to merge 1 commit into
Conversation
scons --dist only copies the libcpu directory of the target architecture, so a dist project built for a non-ARM architecture has no libcpu/arm. The unconditional rsource of arm/Kconfig added by 89c70ab then makes scons --pyconfig-silent fail, which breaks the BSP build CI for every non-ARM BSP. Source arm/Kconfig with orsource, matching how the aarch64 and risc-v Kconfig files are already included. Fixes: 89c70ab ("kconfig部分搬至arm/kconfig")
|
👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。 🛠 操作步骤 | Steps
完成后，提交将自动更新至 如有问题欢迎联系我们，再次感谢您的贡献！💐 |
This branch has not been deployed
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.
Summary
scons --distonly copies thelibcpudirectory of the target architecture (tools/mkdist.py), so a dist project built for a non-ARM architecture does not containlibcpu/arm. Since 89c70ab moved the ARM Kconfig definitions intolibcpu/arm/Kconfigand included them with an unconditionalrsource,scons --pyconfig-silentfails in those dist projects:This breaks the BSP build CI for every non-ARM BSP on master (aarch64, simulator, xuantie, i386, ESP32, riscv and others).
Change
arm/Kconfigwithorsource, matching how the aarch64 and risc-v Kconfig files are already included. The file is still parsed normally when it exists, and is skipped when it does not.Testing
libcpu/Kconfigwith kconfiglib in a tree withoutlibcpu/arm: the old version fails with the CI error above, the new version parses without warnings.