diff options
| author | Roland Hieber <rhi@pengutronix.de> | 2021-10-01 00:34:42 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-10-08 16:15:48 +0200 |
| commit | d57f4c16c33e47a70fb4f194722455995145e9eb (patch) | |
| tree | 4d579f3807de572e763860dedafa3e2b96ba4336 | |
| parent | 2c0ada378b9f19fab9650db5f41aaa4230b357c5 (diff) | |
| download | ptxdist-d57f4c16c33e47a70fb4f194722455995145e9eb.tar.gz ptxdist-d57f4c16c33e47a70fb4f194722455995145e9eb.tar.xz | |
image-rauc: allow selecting the bundle type (plain or verity)
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>
Tested-by: Alexander Dahl <ada@thorsis.com>
Message-Id: <20210930223442.5820-1-rhi@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | config/images/rauc.config | 5 | ||||
| -rw-r--r-- | platforms/image-rauc.in | 15 | ||||
| -rw-r--r-- | rules/image-rauc.make | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/config/images/rauc.config b/config/images/rauc.config index 0c824f00e..ddf40fb17 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 1f9427b40..3fa5dfc8c 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 fe1b0e89b..d70114aa2 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) \ |