On Wed, Feb 1, 2023 at 3:17 PM Maciek Borzecki <maciek@...> wrote:

Add squashfs to images supported by verity.

Signed-off-by: Maciek Borzecki <maciek@...>
---
 classes/dm-verity-img.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/dm-verity-img.bbclass
b/classes/dm-verity-img.bbclass
index dd447e6..e5946bc 100644
--- a/classes/dm-verity-img.bbclass
+++ b/classes/dm-verity-img.bbclass
@@ -63,7 +63,12 @@ verity_setup() {
     veritysetup
--data-block-size=${DM_VERITY_IMAGE_DATA_BLOCK_SIZE}
--hash-offset=$SIZE format $OUTPUT $OUTPUT | tail -n +2 |
process_verity
 }

-VERITY_TYPES = "ext2.verity ext3.verity ext4.verity btrfs.verity
erofs.verity erofs-lz4.verity erofs-lz4hc.verity"
+VERITY_TYPES = " \
+    ext2.verity ext3.verity ext4.verity \
+    btrfs.verity \
+    erofs.verity erofs-lz4.verity erofs-lz4hc.verity \
+    squashfs.verity squashfs-xz.verity squashfs-lzo.verity
squashfs-lz4.verity squashfs-zst.verity \
+"
 IMAGE_TYPES += "${VERITY_TYPES}"
 CONVERSIONTYPES += "verity"
 CONVERSION_CMD:verity = "verity_setup ${type}"
--
2.39.1

Gentle ping about the patch. Wanted to resubmit this to kirkstone along with a cherry-pick of https://git.yoctoproject.org/meta-security/commit/classes/dm-verity-img.bbclass?id=8ca6bb86e653a332f7cb5b30babc0cd6c58769d0, so I'd be thankful for any feedback.

Cheers,
Maciek