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.5-branch] mgmt: updatehub: Fix mark for update #72401

Merged
merged 2 commits into from
Jun 2, 2024

Conversation

zephyrbot
Copy link
Collaborator

@zephyrbot zephyrbot commented May 7, 2024

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

Fixes #69297

@zephyrbot zephyrbot requested a review from nandojve as a code owner May 7, 2024 07:31
@zephyrbot zephyrbot added Backport Backport PR and backport failure issues area: UpdateHub UpdateHub labels May 7, 2024
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 <[email protected]>
(cherry picked from commit 5fb62ca)
@nandojve nandojve force-pushed the backport-72300-to-v3.5-branch branch from cfc93c3 to 46523e5 Compare May 7, 2024 16:49
This fixes compatibility with recent bootutils API.

Fixes #69297

Signed-off-by: Gerson Fernando Budke <[email protected]>
(cherry picked from commit 94cd46d)
@nandojve nandojve force-pushed the backport-72300-to-v3.5-branch branch from 46523e5 to fe928a8 Compare May 7, 2024 17:09
@nandojve
Copy link
Member

nandojve commented Jun 2, 2024

Hi @henrikbrixandersen ,

This is the same patch introduced for v3.6. Do you thing will be possible to merge it?
There is no need to create a release for this and the patch on the branch is more then enough.

@henrikbrixandersen henrikbrixandersen added this to the v3.5.1 milestone Jun 2, 2024
@henrikbrixandersen
Copy link
Member

This is the same patch introduced for v3.6. Do you thing will be possible to merge it?

I would think so, yes. It is up to the v3.5 release managers (@jhedberg and @fabiobaltieri), though.

@jhedberg jhedberg merged commit 77df445 into v3.5-branch Jun 2, 2024
17 checks passed
@nashif nashif deleted the backport-72300-to-v3.5-branch branch November 16, 2024 12:23
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