-
Notifications
You must be signed in to change notification settings - Fork 190
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
Support SquashFS compressed bundles on poky #747
Conversation
4c988b1
to
c05a52f
Compare
For info, those rootfs image names come from http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/image_types.bbclass#n106 |
@om26er Thanks for your PR Yes, this is not really necessary to support compressed bundles, it would only be necessary to support compressed bundles generated by the Yocto About your note on |
Codecov Report
@@ Coverage Diff @@
## master #747 +/- ##
=======================================
Coverage 72.57% 72.57%
=======================================
Files 28 28
Lines 8937 8941 +4
=======================================
+ Hits 6486 6489 +3
- Misses 2451 2452 +1
Continue to review full report at Codecov.
|
As there is no relevant difference between these images from rauc's perspective, it seems easier to solve this on the Yocto side instead of adding more and more extensions to rauc. |
c05a52f
to
44df5cd
Compare
@ejoerns I have now updated the PR to use globbing, I think that makes sense as there are multiple support compression formats. Also updated the commit message |
From my point of view (even if I don't have a super-strong opinion on this), it would be an acceptable trade-off to add a simple glob and be able to support the default image names generated by yocto. The alternative would be to have a workaround for each Yocto BSP generating compressed squashfs names. Or what do you mean by solving this on Yocto side? However, if that should be acceptable, the commit message would still need to be extended. |
Can you suggest a "good" commit message, please ;-) |
something like
@jluebbe you may want to choose if you would follow this argumentation or not ;) |
302574a
to
cfe63a7
Compare
I've changed the commit message based on what @ejoerns suggested. Instead of the |
The Yocto/OE 'image_types' class generates SquashFS images with different file name suffixes, depending on the compression selected (e.g. .squashfs-xz, .squashfs-lzo, ...). With our current image pattern, this would require an extra renaming step (to .squashfs) to allow RAUC to properly recognize the image as a SquashFS. To avoid matching images by mistake (which contain .squashfs somewhere else in the filename), use an explicit list. As Yocto/OE is probably one of the most common build ecosystems RAUC is currently used with, this appears to be an acceptable compromise. Signed-off-by: Omer Akram <omer@thing.com> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
cfe63a7
to
a571725
Compare
I've re-added the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine for me.
However, for similar future cases, having a mapping in meta-rauc
might still be a more future-proof approach.
Adds support for LZO and ZSTD based rootfs bundles. This add support for both casync bundles and the "normal".
This PR also fixes a bug *.squashfs.caibx case as it doesn't work with
ubivol