From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 30 Oct 2024 09:01:14 +0100 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 1t63dh-002c7f-23 for lore@lore.pengutronix.de; Wed, 30 Oct 2024 09:01:14 +0100 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 1t63dh-00069k-VV; Wed, 30 Oct 2024 09:01:13 +0100 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 1t63dB-00058f-8s; Wed, 30 Oct 2024 09:00:41 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) 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 1t63dB-0019xQ-07; Wed, 30 Oct 2024 09:00:41 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1t63dA-00HZz4-3C; Wed, 30 Oct 2024 09:00:40 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 30 Oct 2024 09:00:40 +0100 Message-Id: <20241030080040.4189891-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023060628.8357-1-ada@thorsis.com> References: <20241023060628.8357-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] ptxd_lib_template: image-fit: Fix nested replacement 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: Alexander Dahl 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 Thanks, applied as b67947db5769533df662efaf52fcde3ecbcea8fe. Michael [sent from post-receive hook] On Wed, 30 Oct 2024 09:00:40 +0100, 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 > > 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 > Message-Id: <20241023060628.8357-1-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > 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 > " > ;; > *)