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

Default delta updater can delta non-block resources #886

Conversation

jeanparpaillon
Copy link

Requires fwup >= 1.10.0

Closes #885

@jeanparpaillon
Copy link
Author

See fwup-home/fwup#202 for fwup related PR
Minimal version may change depending on fwup next release

@jeanparpaillon jeanparpaillon force-pushed the 885-handle-fat-resources-delta branch 2 times, most recently from 0f72d6b to bcebab3 Compare March 21, 2023 14:06
@fhunleth
Copy link
Contributor

@jeanparpaillon Thanks! This looks great.

I'm working with @oestrich and @jjcarstens to get this change in. We're in an awkward place where we're doing a lot of testing with a modified version of NervesHub. See https://github.com/nerves-hub/nerves_hub_web/commits/2.0. We're working on docs and updates to describe the direction we're going in 2.0. The main reason for 2.0, though, is to let us break compatibility in a few areas to make implementing some features we really want much easier.

In summary, I suspect that we merge your PR to main, since you're actively testing so it should work. We'll also merge to the 2.0 branch and do our testing. I'll defer to Eric and Jon since there more into the code here than I am.

@jeanparpaillon
Copy link
Author

@fhunleth thanks for the heads up. You may have noticed I have arbitrarily set a minimal fwup version in the code that need to be adjusted with regard to the PR in fwup.

@jeanparpaillon jeanparpaillon force-pushed the 885-handle-fat-resources-delta branch from bcebab3 to cce6162 Compare April 5, 2023 12:17
@jeanparpaillon
Copy link
Author

@fhunleth I've identified a bug in the code and just updated the PR: when creating firmware archive, ensure meta.conf. and meta.conf are the first files in the archive

@jeanparpaillon
Copy link
Author

@fhunleth same fix pushed to nerves-project/nerves#857

@fhunleth fhunleth changed the base branch from main to maint-v1.0 April 14, 2023 14:20
@fhunleth
Copy link
Contributor

FYI - I switched the destination branch to maint-v1.0. When this functionality gets added, I'd like to get it in 2.0 as well.

Copy link
Collaborator

@jjcarstens jjcarstens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So sorry this took so long! Will add to main shortly as well

@jjcarstens jjcarstens merged commit 8fbf323 into nerves-hub:maint-v1.0 Dec 29, 2023
jjcarstens added a commit that referenced this pull request Dec 29, 2023
jjcarstens added a commit that referenced this pull request Dec 29, 2023
@jeanparpaillon
Copy link
Author

👍

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.

Add support for FAT resources delta updates
3 participants