From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Alexander Dahl <ada@thorsis.com>
Cc: ptxdist@pengutronix.de, Roland Hieber <rhi@pengutronix.de>
Subject: Re: [ptxdist] [PATCH] ptxd_lib_template: image-fit: Add second replacement run
Date: Tue, 22 Oct 2024 14:26:53 +0200 [thread overview]
Message-ID: <ZxeaDbOKdIHJbFf9@pengutronix.de> (raw)
In-Reply-To: <20241022082730.133421-1-ada@thorsis.com>
On Tue, Oct 22, 2024 at 10:27:30AM +0200, Alexander Dahl 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
This is define directly in scripts/lib/ptxd_lib_template.sh. I think it
would be better to replace that there:
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
Michael
>
> After a second replacement run on the already created rule, 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>
> ---
> scripts/lib/ptxd_lib_template.sh | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
> index cc512faa1..163f4c828 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -625,6 +625,10 @@ IMAGE_@PACKAGE@_KEY_NAME_HINT := # TODO: key-name-hint property in the signature
> ;;
> esac
> ptxd_template_write_platform_rules
> + # second replacement run for @PACKAGE@ nested in CODE_SIGNING_VARS
> + filename="${PTXDIST_PLATFORMCONFIGDIR}/rules/${class}${package_filename}.make"
> + tmpfile="$(mktemp "${PTXDIST_TEMPDIR}/template_new_image_fit.XXXXXXXX")"
> + ptxd_replace_magic "${filename}" > "${tmpfile}" && mv "${tmpfile}" "${filename}"
> }
> export -f ptxd_template_new_image_fit
> ptxd_template_help_list[${#ptxd_template_help_list[@]}]="image-fit"
>
> base-commit: 49049c01b0a932c74c77b64f1b42c85141fec8e4
> --
> 2.39.5
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
prev parent reply other threads:[~2024-10-22 12:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 8:27 Alexander Dahl
2024-10-22 12:26 ` 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=ZxeaDbOKdIHJbFf9@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=ada@thorsis.com \
--cc=ptxdist@pengutronix.de \
--cc=rhi@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