[ptxdist] [PATCH v2] ptxd_lib_template: image-fit: Fix nested replacement

[ptxdist] [PATCH v2] ptxd_lib_template: image-fit: Fix nested replacement

[Alexander Dahl]

The @PACKAGE@ inside of $CODE_SIGNING_VARS was not replaced before,
leading to output in the make rule like this:

  IMAGE_@PACKAGE@_SIGN_ROLE       := # TODO: role name of the code signing provider, passed to cs_get_uri
  IMAGE_@PACKAGE@_KEY_NAME_HINT   := # TODO: key-name-hint property in the signature node of the FIT image

Using shell variables before assignement, it looks
like this now (for image fit package named 'foo'):

  IMAGE_FOO_SIGN_ROLE     := # TODO: role name of the code signing provider, passed to cs_get_uri
  IMAGE_FOO_KEY_NAME_HINT := # TODO: key-name-hint property in the signature node of the FIT image

Fixes: c9659e6c318f ("templates: add template for custom FIT images")
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---

Notes:
    v2:
    - use shell variables to set $CODE_SIGNING_VARS to avoid second
      replacement run
    - reword commit message accordingly
    
    v1:
    - Link: https://lore.ptxdist.org/ptxdist/20241022082730.133421-1-ada@thorsis.com/T/#u

 scripts/lib/ptxd_lib_template.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
index cc512faa1..ce20ae705 100644
--- a/scripts/lib/ptxd_lib_template.sh
+++ b/scripts/lib/ptxd_lib_template.sh
@@ -615,8 +615,8 @@ ptxd_template_new_image_fit() {
 	    export select_CODE_SIGNING="select CODE_SIGNING
 	"
 	    export CODE_SIGNING_VARS="
-IMAGE_@PACKAGE@_SIGN_ROLE	:= # TODO: role name of the code signing provider, passed to cs_get_uri
-IMAGE_@PACKAGE@_KEY_NAME_HINT	:= # TODO: key-name-hint property in the signature node of the FIT image
+IMAGE_${PACKAGE}_SIGN_ROLE	:= # TODO: role name of the code signing provider, passed to cs_get_uri
+IMAGE_${PACKAGE}_KEY_NAME_HINT	:= # TODO: key-name-hint property in the signature node of the FIT image
 "
 	;;
 	*)

base-commit: 49049c01b0a932c74c77b64f1b42c85141fec8e4
-- 
2.39.5

Re: [ptxdist] [APPLIED] ptxd_lib_template: image-fit: Fix nested replacement

[Michael Olbrich]

Thanks, applied as b67947db5769533df662efaf52fcde3ecbcea8fe.

Michael

[sent from post-receive hook]

On Wed, 30 Oct 2024 09:00:40 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> The @PACKAGE@ inside of $CODE_SIGNING_VARS was not replaced before,
> leading to output in the make rule like this:
> 
>   IMAGE_@PACKAGE@_SIGN_ROLE       := # TODO: role name of the code signing provider, passed to cs_get_uri
>   IMAGE_@PACKAGE@_KEY_NAME_HINT   := # TODO: key-name-hint property in the signature node of the FIT image
> 
> Using shell variables before assignement, it looks
> like this now (for image fit package named 'foo'):
> 
>   IMAGE_FOO_SIGN_ROLE     := # TODO: role name of the code signing provider, passed to cs_get_uri
>   IMAGE_FOO_KEY_NAME_HINT := # TODO: key-name-hint property in the signature node of the FIT image
> 
> Fixes: c9659e6c318f ("templates: add template for custom FIT images")
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20241023060628.8357-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
> index cc512faa1821..ce20ae705bc6 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -615,8 +615,8 @@ ptxd_template_new_image_fit() {
>  	    export select_CODE_SIGNING="select CODE_SIGNING
>  	"
>  	    export CODE_SIGNING_VARS="
> -IMAGE_@PACKAGE@_SIGN_ROLE	:= # TODO: role name of the code signing provider, passed to cs_get_uri
> -IMAGE_@PACKAGE@_KEY_NAME_HINT	:= # TODO: key-name-hint property in the signature node of the FIT image
> +IMAGE_${PACKAGE}_SIGN_ROLE	:= # TODO: role name of the code signing provider, passed to cs_get_uri
> +IMAGE_${PACKAGE}_KEY_NAME_HINT	:= # TODO: key-name-hint property in the signature node of the FIT image
>  "
>  	;;
>  	*)