Re: [ptxdist] [APPLIED] rauc/image-rauc: move BUNDLE_VERSION to image-rauc

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

Thanks, applied as 6ffbc11e383c3d674aca5868dce606d875c544cc.

Michael

[sent from post-receive hook]

On Thu, 11 Apr 2024 17:04:59 +0200, Michael Tretter <m.tretter@pengutronix.de> wrote:
> RAUC_BUNDLE_VERSION is only used by the image rule to generate the
> bundle. Therefore, it belongs into image-rauc.
> 
> This fixes the issue that RAUC is rebuilt on every commit in a BSP, as a
> commit changes PTXDIST_BSP_AUTOVERSION, which in turn changes the
> configuration of RAUC. The rebuild is not necessary and only the RAUC
> bundle should be rebuilt if the version has changed.
> 
> Rename the config, as the move to the image moves the item from the
> ptxconfig to the platformconfig.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20240410081234.3902043-1-m.tretter@pengutronix.de>
> [mol: fix indention]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
> index 2070cf0069c1..2faa8ff7e1d8 100644
> --- a/platforms/image-rauc.in
> +++ b/platforms/image-rauc.in
> @@ -19,6 +19,13 @@ menuconfig IMAGE_RAUC
>  
>  if IMAGE_RAUC
>  
> +config IMAGE_RAUC_BUNDLE_VERSION
> +	string
> +	prompt "RAUC Bundle Version"
> +	default "${PTXDIST_BSP_AUTOVERSION}"
> +	help
> +	  Version that will be placed in the bundle's metadata.
> +
>  config IMAGE_RAUC_DESCRIPTION
>  	prompt "RAUC Bundle Description"
>  	string
> diff --git a/rules/image-rauc.make b/rules/image-rauc.make
> index a05c19f61de2..30e460dd8cd7 100644
> --- a/rules/image-rauc.make
> +++ b/rules/image-rauc.make
> @@ -58,7 +58,7 @@ IMAGE_RAUC_ENV	= \
>  	$(CODE_SIGNING_ENV) \
>  	RAUC_BUNDLE_COMPATIBLE="$(call remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
>  	RAUC_BUNDLE_FORMAT=$(IMAGE_RAUC_BUNDLE_FORMAT) \
> -	RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_RAUC_BUNDLE_VERSION))" \
> +	RAUC_BUNDLE_VERSION="$(call remove_quotes, $(PTXCONF_IMAGE_RAUC_BUNDLE_VERSION))" \
>  	RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
>  	RAUC_BUNDLE_DESCRIPTION="$(call remove_quotes, $(PTXCONF_IMAGE_RAUC_DESCRIPTION))" \
>  	$(IMAGE_RAUC_ENV_HOOK) \
> diff --git a/rules/rauc.in b/rules/rauc.in
> index e67f5131c615..ee9c3f955b79 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -105,13 +105,6 @@ config RAUC_COMPATIBLE
>  	  Only if the compatible in the targets RAUC system.conf file and those
>  	  in the Bundle's manifest match exactly, an update will be performed
>  
> -config RAUC_BUNDLE_VERSION
> -	string
> -	prompt "RAUC Bundle Version"
> -	default "${PTXDIST_BSP_AUTOVERSION}"
> -	help
> -	  Overwrite the bundle version if needed.
> -
>  endif
>  
>  config RAUC_BAREBOX