Skip to content

Conversation

@zephyrbot
Copy link

@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
nandojve added 2 commits May 7, 2024 18:58
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)
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.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
@nashif nashif deleted the backport-72300-to-v3.6-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.

5 participants