mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: Bastian Krause <bst@pengutronix.de>
Subject: [PATCH] ARM: i.MX: HAB: Allow for semicolons in HAB environment variables
Date: Thu, 16 Jan 2025 10:38:59 +0100	[thread overview]
Message-ID: <20250116093859.1676220-1-s.hauer@pengutronix.de> (raw)

With CONFIG_HAB_CERTS_ENV=y, paths and PKCS#11 URIs to the HAB
certificates are taken from environment variables (allowing for better
integration with build systems). In this case these values are passed
internally via compiler macros (-D) to the imx-image host tool. PKCS#11
URIs usually contain semicolons. The semicolons didn't make it through
to the imx-image configuration file due to wrong escapes. Fix this by
expanding the environment variables using make rather than shell.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f195ddb7e8..7dcd8c9892 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -579,7 +579,7 @@ cmd_imximage_S_dcd=						\
 overwrite-hab-env = $(shell set -e; \
       test -n "$(CONFIG_HAB_CERTS_ENV)"; \
       test -n "$$$(1)"; \
-      echo -D$(1)=\\\"$(shell echo $$$(1))\\\")
+      echo -D$(1)=\''"${${1}}"'\')
 
 overwrite-fit-env = $(shell set -e; \
       test -n "$(CONFIG_BOOTM_FITIMAGE_PUBKEY_ENV)"; \
-- 
2.39.5




             reply	other threads:[~2025-01-16  9:39 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-16  9:38 Sascha Hauer [this message]
2025-01-16 10:25 ` Bastian Krause
2025-01-16 11:07 ` Sascha Hauer
2025-01-16 11:12 ` Ahmad Fatoum
2025-01-16 11:26   ` Bastian Krause
2025-01-16 13:50     ` Ahmad Fatoum
2025-01-16 14:34       ` Bastian Krause
2025-01-16 14:35         ` Ahmad Fatoum

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=20250116093859.1676220-1-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=bst@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