Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Bump to NCS 2.7.0 #213

Closed
wants to merge 2 commits into from
Closed

Bump to NCS 2.7.0 #213

wants to merge 2 commits into from

Conversation

mondalaci
Copy link
Member

@benedekkupper I need your help with this PR:

ERROR: Error applying 0001-Remove-mcuboot-build-warnings.patch to sdk-nrf: Cmd('git') failed due to: exit code(128)
  cmdline: git am /home/laci/projects/firmware-uhk80/firmware-uhk80/patches/sdk-nrf/0001-Remove-mcuboot-build-warnings.patch
  stdout: 'Applying: Remove mcuboot build warnings
Patch failed at 0001 Remove mcuboot build warnings
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: patch failed: cmake/partition_manager.cmake:76
error: cmake/partition_manager.cmake: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

The old patch format was a simple diff, but the new one is more sophisticated. Please tell me how to create a patch that is accepted by west patch.

@benedekkupper
Copy link
Contributor

Have you seen how much they have overhauled in 2.7.0? My toolchain manager says the support for this version in vscode is still experimental. Getting rid of the west patch issue is as simple as removing the offending patch file. I get a lot of Kconfig errors when trying to build it afterwards though, and I don't know if it's a problem with our project setup, or an outcome of their restructuring.

@mondalaci
Copy link
Member Author

@benedekkupper, I've just checked the release notes, which worries me. But we have to cross this bridge sooner or later, and I prefer sooner because we may have to refactor more code later than sooner.

To my knowledge, NCS 2.7.0 is supported by the pre-release version of the vscode extension. It's trivial to switch to the pre-release version in vscode.

Can you port the project? I think this task may heavily involve the build chain with which you're the most knowledgeable of us.

@benedekkupper
Copy link
Contributor

I tried to make some progress on this, but I hit a roadblock, somehow the new build doesn’t pick up the board specific kconfig file and thus fails with kconfig warnings. Since I have no idea about this board management part, and none of the obvious zephyr examples I found dealt with this situation, I couldn’t get past this. IMO we should leave this on the side for now, there are other issues that yield more benefits than this one.

@mondalaci
Copy link
Member Author

@benedekkupper Would it make sense to commit what you have? Then, I'd discuss this with the Nordic folks, and you could move on to other issues that better fit your expertise.

@benedekkupper
Copy link
Contributor

I pushed the removal of the incompatible patch file, now the CI output shows what Kconfig issues I was talking about.

@mondalaci
Copy link
Member Author

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants