From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 23 Oct 2024 08:06:52 +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 1t3UWC-007lhz-1T for lore@lore.pengutronix.de; Wed, 23 Oct 2024 08:06:52 +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 1t3UWC-0003Qt-2K; Wed, 23 Oct 2024 08:06:52 +0200 Received: from mail.thorsis.com ([217.92.40.78]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1t3UVu-0003Qa-15; Wed, 23 Oct 2024 08:06:34 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D4AE8148B1E9; Wed, 23 Oct 2024 08:06:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1729663593; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=oAkejvH7WwCbYDM2bqU1K6wkfis3RGxB330M5hNUN8k=; b=RkRshih3e2Sr/3yYk/umC0XuegcxKCa3/M0nj2xX5eNQqaZwEu4Lt3JNw6fVDWU88Evb6z DvJ8/jUpGfRMn6oWNIo8q0NOTEnefqwoe8ApzjOxyx8Uei0xAbCjWG2SMIXmQEGjQ4RRuj MkuJKOxe9zos4+SKyuWQZnO4wuHMlD66I5079K3k/yr5T2lop7YIq2nsXigUiF2saFYAto P+V3PWLfiJLfIVf2zHkkDG+AN+xEttM5Ss6An0sJmlmPzs5MYbAPZ37VdF3F/3UYX4tWIJ f/+IuOAa0fbIv53BvG9dlLhQCoZpyhEOrW1Ez6kRtdcAH1PPYShgHCcxpENFIg== From: Alexander Dahl To: ptxdist@pengutronix.de Date: Wed, 23 Oct 2024 08:06:28 +0200 Message-Id: <20241023060628.8357-1-ada@thorsis.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] 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: 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 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 --- Notes: v2: - use shell variables to set $CODE_SIGNING_VARS to avoid second replacement run - reword commit message accordingly v1: - Link: https://lore.ptxdist.org/ptxdist/20241022082730.133421-1-ada@thorsis.com/T/#u scripts/lib/ptxd_lib_template.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh index cc512faa1..ce20ae705 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 " ;; *) base-commit: 49049c01b0a932c74c77b64f1b42c85141fec8e4 -- 2.39.5