[ptxdist] [PATCH] image-rauc: allow selecting the bundle type (plain or verity)

[Roland Hieber <rhi@pengutronix.de>]

Newer setups probably want to use the improved 'verity' format, while
existing setups probably need to stay with 'plain' to provide an upgrade
path. See the discussion of the differences between the formats in
<https://rauc.readthedocs.io/en/latest/reference.html#sec-ref-formats>.

Reported-by: Alexander Dahl <ada@thorsis.com>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 config/images/rauc.config |  5 ++++-
 platforms/image-rauc.in   | 15 +++++++++++++++
 rules/image-rauc.make     |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/config/images/rauc.config b/config/images/rauc.config
index 0c824f00e5d3..ddf40fb17054 100644
--- a/config/images/rauc.config
+++ b/config/images/rauc.config
@@ -7,7 +7,10 @@ image @IMAGE@ {
 			version=@RAUC_BUNDLE_VERSION@
 			build=@RAUC_BUNDLE_BUILD@
 			description=@RAUC_BUNDLE_DESCRIPTION@
-
+			
+			[bundle]
+			format=@RAUC_BUNDLE_FORMAT@
+			
 			[image.rootfs]
 			filename=root.tar.gz
 			"
diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
index 1f9427b40f42..3fa5dfc8c13a 100644
--- a/platforms/image-rauc.in
+++ b/platforms/image-rauc.in
@@ -26,4 +26,19 @@ config IMAGE_RAUC_DESCRIPTION
 	help
 	  Optional description that will be placed in the Bundles metadata.
 
+choice
+	prompt "Bundle format"
+
+config IMAGE_RAUC_BUNDLE_FORMAT_PLAIN
+	bool "plain"
+	help
+	  The old bundle format, which since rauc 1.5 is now known as 'plain'.
+
+config IMAGE_RAUC_BUNDLE_FORMAT_VERITY
+	bool "verity"
+	help
+	  The improved 'verity' bundle format
+
+endchoice
+
 endif
diff --git a/rules/image-rauc.make b/rules/image-rauc.make
index fe1b0e89be7c..d70114aa2b85 100644
--- a/rules/image-rauc.make
+++ b/rules/image-rauc.make
@@ -29,6 +29,7 @@ ifdef PTXCONF_IMAGE_RAUC
 IMAGE_RAUC_ENV	= \
 	$(CODE_SIGNING_ENV) \
 	RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
+	RAUC_BUNDLE_FORMAT="$(call ptx/ifdef,PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_VERITY,verity,plain)" \
 	RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \
 	RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
 	RAUC_BUNDLE_DESCRIPTION=$(PTXCONF_IMAGE_RAUC_DESCRIPTION) \
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de