cpu/nrf5x_common: fix vendor header regression from #21800 #21812
+15
−7
Conversation
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
When not using the Rust version of Git-Cache, the build system clones the full NRFX repository which led to errors during the build process due to duplicated headers and headers not found where they were expected.
Contributor
|
Thanks for the quick fix @crasbe. Can confirm that this fixes the issue for me. |
maribu
approved these changes
Oct 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Contribution description
When not using the Rust version of Git-Cache, the build system clones the full NRFX repository which led to errors during the build process due to duplicated headers and headers not found where they were expected.
Furthermore the initial approach would copy all the files from the
mdk/subdirectory, which are unnecessarily many. Therefore it was changed to copy only the files defined in the sparse pathSince now we (might) have to deal with the full
nrfxpackage again, I had to move the patches from separate subfolders to a common folder because we may (or may not) have to apply all at once, otherwise building fornrf52first and then fornrf53would fail, because the latter is unpatched...Thanks for @elenaf9 for finding this issue.
Testing procedure
Since CI uses the Rust version of
git-cache, it did not catch the regression.To run the testing manually you have to clear the
build/nrf5x_nrfx_mdkand make sure you're not using the rust version of git cache.I guess it's possible to test it with
make -C examples/networking/gnrc/gnrc_networking generate-Makefile.ci, whichis currently running onbuilt successful onskyleaf.skyleaf.Current behavior:
Behavior with this PR:
Issues/PRs references
Fixes a regression introduced in #21800.