Re: [ptxdist] [APPLIED] image-rauc: add support for crypt bundles

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 5bb0db5266e4d087b98dd0ca39a5c62ad9fe7124.

Michael

[sent from post-receive hook]

On Mon, 20 Jun 2022 08:20:00 +0200, Enrico Jorns <ejo@pengutronix.de> wrote:
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> Message-Id: <20220615142217.990960-5-ejo@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
> index 3835e071892d..7772fd95b21b 100644
> --- a/platforms/image-rauc.in
> +++ b/platforms/image-rauc.in
> @@ -39,6 +39,14 @@ config IMAGE_RAUC_BUNDLE_FORMAT_VERITY
>  	help
>  	  The improved 'verity' bundle format
>  
> +config IMAGE_RAUC_BUNDLE_FORMAT_CRYPT
> +	bool "crypt"
> +	help
> +	  The 'crypt' bundle format for fully encryptable bundles
> +
> +	  Note that you must run 'rauc encrypt' on a crypt bundle to generate a
> +	  fully encrypted bundle.
> +
>  endchoice
>  
>  config IMAGE_RAUC_INTERMEDIATE
> diff --git a/rules/image-rauc.make b/rules/image-rauc.make
> index f7bed6e49d99..23d8d83b5251 100644
> --- a/rules/image-rauc.make
> +++ b/rules/image-rauc.make
> @@ -26,10 +26,20 @@ IMAGE_RAUC_CONFIG	:= rauc.config
>  
>  ifdef PTXCONF_IMAGE_RAUC
>  
> +ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_PLAIN
> +IMAGE_RAUC_BUNDLE_FORMAT := "plain"
> +endif
> +ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_VERITY
> +IMAGE_RAUC_BUNDLE_FORMAT := "verity"
> +endif
> +ifdef PTXCONF_IMAGE_RAUC_BUNDLE_FORMAT_CRYPT
> +IMAGE_RAUC_BUNDLE_FORMAT := "crypt"
> +endif
> +
>  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_FORMAT=$(IMAGE_RAUC_BUNDLE_FORMAT) \
>  	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) \