From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 22 Oct 2024 14:27:14 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1t3Dyk-007SdW-2T for lore@lore.pengutronix.de; Tue, 22 Oct 2024 14:27:14 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1t3Dyk-0005hb-Ba; Tue, 22 Oct 2024 14:27:14 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t3DyP-0005hK-N8; Tue, 22 Oct 2024 14:26:53 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1t3DyP-000rLn-1a; Tue, 22 Oct 2024 14:26:53 +0200 Received: from mol by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1t3DyP-007bCR-1K; Tue, 22 Oct 2024 14:26:53 +0200 Date: Tue, 22 Oct 2024 14:26:53 +0200 From: Michael Olbrich To: Alexander Dahl Message-ID: Mail-Followup-To: Alexander Dahl , ptxdist@pengutronix.de, Roland Hieber References: <20241022082730.133421-1-ada@thorsis.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241022082730.133421-1-ada@thorsis.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-IRC: #ptxdist @freenode Subject: Re: [ptxdist] [PATCH] ptxd_lib_template: image-fit: Add second replacement run X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de, Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false 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 > --- > 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 |