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

[Backport v3.6-branch] mgmt: updatehub: Fix mark for update #72402

Merged
merged 2 commits into from
May 29, 2024

Conversation

zephyrbot
Copy link
Collaborator

@zephyrbot zephyrbot commented May 7, 2024

Backport 94cd46d from #72300.
Backport 5fb62ca from #72036.

Fixes #69297

@zephyrbot zephyrbot added Backport Backport PR and backport failure issues Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc. area: UpdateHub UpdateHub labels May 7, 2024
@zephyrbot zephyrbot requested a review from nandojve May 7, 2024 07:32
After the changes introduced by #50816 the UpdateHub could not decode
anymore the JSON object. This introduce missing parsing definitions
to allow JSON parser undertood the correct UpdateHub probe object.

Fixes #69297

Signed-off-by: Gerson Fernando Budke <gerson.budke@ossystems.com.br>
(cherry picked from commit 5fb62ca)
This fixes compatibility with recent bootutils API.

Fixes #69297

Signed-off-by: Gerson Fernando Budke <gerson.budke@ossystems.com.br>
(cherry picked from commit 94cd46d)
@nandojve nandojve force-pushed the backport-72300-to-v3.6-branch branch from 3a8bc88 to 25d6616 Compare May 7, 2024 17:11
@henrikbrixandersen henrikbrixandersen removed the Trivial Changes that can be reviewed by anyone, i.e. doc changes, minor build system tweaks, etc. label May 23, 2024
@henrikbrixandersen
Copy link
Member

@nandojve In the future, please avoid pushing to the automated backport branches. That defeats the idea of the automation being trustworthy.

@henrikbrixandersen henrikbrixandersen merged commit 899e9e5 into v3.6-branch May 29, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: UpdateHub UpdateHub Backport Backport PR and backport failure issues
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants