Skip to content
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

Update to Memfault SDK 1.5.0-rc1 #11

Closed
wants to merge 1 commit into from
Closed

Conversation

noahp
Copy link
Contributor

@noahp noahp commented Nov 21, 2023

This is a branch I pushed to our public SDK github repo.

Note that I'll need to rebase the gminn/lte-metrics branch of
https://github.com/memfault/sdk-nrf.git to pick up a newer upstream
main, which has an updated sha of their Zephyr fork which includes
this commit:

zephyrproject-rtos/zephyr@e7bd10a

Otherwise the build fails, because our NCS branch is pointing to a
commit off upstream main that was randomly off Zephyr working main.

This is a branch I pushed to our public SDK github repo.

Note that I'll need to rebase the `gminn/lte-metrics` branch of
https://github.com/memfault/sdk-nrf.git to pick up a newer upstream
`main`, which has an updated sha of their Zephyr fork which includes
this commit:

zephyrproject-rtos/zephyr@e7bd10a

Otherwise the build fails, because our NCS branch is pointing to a
commit off upstream main that was randomly off Zephyr working main.
@noahp noahp requested a review from a team November 21, 2023 23:58
Copy link
Member

gminn commented Nov 22, 2023

The build still fails even with the latest main nrf sdk 😢 They are still on a commit that points to zephyr 3.4.99, which doesn't have the updates because the header changes got added to one of the release candidates, not 3.4.99. You'd think that wouldn't be an issue because our zephyr versioning logic would fix it, but we don't account for the case of changes getting added to release candidates; we assume 3.4.99 is greater than 3.4, and therefore includes the header name change, because it would typically include all the changes for 3.5.0. I have a proposed fix here: https://github.com/memfault/memfault/pull/11865

This made my brain hurt 😅 hopefully I got this straight

@noahp
Copy link
Contributor Author

noahp commented Nov 22, 2023

#12 had a better version of this change!

@noahp noahp closed this Nov 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants