From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <ada@thorsis.com>
Subject: Re: [ptxdist] [APPLIED] ptxd_lib_template: image-fit: Fix nested replacement
Date: Wed, 30 Oct 2024 09:00:40 +0100 [thread overview]
Message-ID: <20241030080040.4189891-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20241023060628.8357-1-ada@thorsis.com>
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
> "
> ;;
> *)
prev parent reply other threads:[~2024-10-30 8:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-23 6:06 [ptxdist] [PATCH v2] " Alexander Dahl
2024-10-30 8:00 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241030080040.4189891-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox