* [ptxdist] [PATCH] image-rauc: allow selecting the bundle type (plain or verity)
@ 2021-09-30 22:34 Roland Hieber
2021-10-01 7:24 ` Alexander Dahl
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 2 replies; 3+ messages in thread
From: Roland Hieber @ 2021-09-30 22:34 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl, Roland Hieber
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [ptxdist] [PATCH] image-rauc: allow selecting the bundle type (plain or verity)
2021-09-30 22:34 [ptxdist] [PATCH] image-rauc: allow selecting the bundle type (plain or verity) Roland Hieber
@ 2021-10-01 7:24 ` Alexander Dahl
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Dahl @ 2021-10-01 7:24 UTC (permalink / raw)
To: Roland Hieber, ptxdist
Hello Roland,
nice to see this. One could have set it in a rauc.config copied to the
own BSP, but this is simpler to use.
Am Fri, Oct 01, 2021 at 12:34:42AM +0200 schrieb Roland Hieber:
> 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) \
Tested-by: Alexander Dahl <ada@thorsis.com>
Greets
Alex
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [ptxdist] [APPLIED] image-rauc: allow selecting the bundle type (plain or verity)
2021-09-30 22:34 [ptxdist] [PATCH] image-rauc: allow selecting the bundle type (plain or verity) Roland Hieber
2021-10-01 7:24 ` Alexander Dahl
@ 2021-10-20 9:39 ` Michael Olbrich
1 sibling, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2021-10-20 9:39 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as d57f4c16c33e47a70fb4f194722455995145e9eb.
Michael
[sent from post-receive hook]
On Wed, 20 Oct 2021 11:39:37 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> 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>
>
> 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) \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-20 9:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 22:34 [ptxdist] [PATCH] image-rauc: allow selecting the bundle type (plain or verity) Roland Hieber
2021-10-01 7:24 ` Alexander Dahl
2021-10-20 9:39 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox