From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20200515142641.812-11-bst@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1jb1Ha-0001Cy-Sc@dude02.lab.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Tue, 19 May 2020 14:23:42 +0200
Subject: Re: [ptxdist] [APPLIED] ptxd_make_fit_image: sign ramdisk if enabled
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Krause <bst@pengutronix.de>

Thanks, applied as 3573571a0883b7119d8b36553befaa6c7857f407.

Michael

[sent from post-receive hook]

On Tue, 19 May 2020 14:23:42 +0200, Bastian Krause <bst@pengutronix.de> wrote:
> Until now only kernel and fdt are signed by mkimage. If a ramdisk is
> used sign it also.
> 
> Unfortunately quotes are not usable in the alternative value of
> variable paramater substitution ${parameter:+alt_value}:
> 
>   https://stackoverflow.com/questions/40995523/bash-variable-expansion-var-in-here-document-removing-double-quotes
> 
> Thus use printf as a workaround.
> 
> Signed-off-by: Bastian Krause <bst@pengutronix.de>
> Message-Id: <20200515142641.812-11-bst@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_fit_image.sh b/scripts/lib/ptxd_make_fit_image.sh
> index c2725ab3ddde..56f273686dc4 100644
> --- a/scripts/lib/ptxd_make_fit_image.sh
> +++ b/scripts/lib/ptxd_make_fit_image.sh
> @@ -78,7 +78,7 @@ EOF
>  			signature-1 {
>  				algo = "sha256,rsa4096";
>  				key-name-hint = "${image_key_name_hint}";
> -				sign-images = "fdt", "kernel";
> +				sign-images = "fdt", "kernel"${image_initramfs:+$(printf %s ', "ramdisk"')};
>  			};
>  EOF
>  	fi

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de