From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH] ptxd_lib_template: image-fit: Add second replacement run
Date: Tue, 22 Oct 2024 10:27:30 +0200 [thread overview]
Message-ID: <20241022082730.133421-1-ada@thorsis.com> (raw)
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
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
next reply other threads:[~2024-10-22 8:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-22 8:27 Alexander Dahl [this message]
2024-10-22 12:26 ` Michael Olbrich
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=20241022082730.133421-1-ada@thorsis.com \
--to=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