Merge pull request #53 from ejoerns/rpi-verity

meta-rauc-raspberrypi: Enable 'verity' and HTTP(S) bundle streaming support
rauc · Feb 17, 2023 · 3d43459 · 3d43459
2 parents 83439d1 + f433c66
commit 3d43459
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/meta-rauc-raspberrypi/conf/layer.conf b/meta-rauc-raspberrypi/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILE_PATTERN_meta-rauc-raspberrypi = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-rauc-raspberrypi = "6"
 
 LAYERDEPENDS_meta-rauc-raspberrypi = "core rauc raspberrypi"
-LAYERSERIES_COMPAT_meta-rauc-raspberrypi = "dunfell gatesgarth hardknott honister"
+LAYERSERIES_COMPAT_meta-rauc-raspberrypi = "dunfell gatesgarth hardknott honister kirkstone"
diff --git a/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb b/meta-rauc-raspberrypi/recipes-core/bundles/update-bundle.bb
@@ -5,6 +5,9 @@ inherit bundle
 RAUC_BUNDLE_COMPATIBLE = "RaspberryPi4"
 RAUC_BUNDLE_VERSION = "v20200703"
 RAUC_BUNDLE_DESCRIPTION = "RAUC Demo Bundle"
+
+RAUC_BUNDLE_FORMAT = "verity"
+
 RAUC_BUNDLE_SLOTS = "rootfs" 
 RAUC_SLOT_rootfs = "core-image-minimal"
 RAUC_SLOT_rootfs[fstype] = "ext4"

diff --git a/meta-rauc-raspberrypi/recipes-kernel/linux/files/rauc.cfg b/meta-rauc-raspberrypi/recipes-kernel/linux/files/rauc.cfg
@@ -1,6 +1,8 @@
-CONFIG_SQUASHFS=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_SQUASHFS_FILE_CACHE=y
-CONFIG_SQUASHFS_DECOMP_SINGLE=y
-CONFIG_SQUASHFS_ZLIB=y
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_DM_VERITY=y
+CONFIG_SQUASHFS=y
+CONFIG_CRYPTO_SHA256=y
+# For bundle streaming
+CONFIG_BLK_DEV_NBD=y