From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
In-Reply-To: <20210228234809.5294-2-rhi@pengutronix.de>
MIME-Version: 1.0
Message-Id: <E1lI4qk-000AMD-0V@dude03.red.stw.pengutronix.de>
From: Michael Olbrich <mol@pengutronix.de>
Date: Fri, 05 Mar 2021 08:26:14 +0100
Subject: Re: [ptxdist] [APPLIED] rauc: be more verbose why the check for
 legacy keyring fails
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: Roland Hieber <rhi@pengutronix.de>

Thanks, applied as 73c6cbfbac24ddcbe013b4647314a47d81adecec.

Michael

[sent from post-receive hook]

On Fri, 05 Mar 2021 08:26:14 +0100, Roland Hieber <rhi@pengutronix.de> wrote:
> Instead of relying on users to grep in the PTXdist source code for this
> line, tell them directly what is checked here.
> 
> Also fix a typo in the previous-to-last line.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210228234809.5294-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 66c967d44b83..08df6336a7cd 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -50,8 +50,10 @@ RAUC_CONF_OPT	:= \
>  
>  $(STATEDIR)/rauc.prepare:
>  	@$(call targetinfo)
> -	@test ! -e "$(call ptx/in-platformconfigdir, config/rauc/rauc.key.pem)" || \
> -		ptxd_bailout "Please use the signing provider infrastructure desribed in:" \
> +	@keyfile="$(call ptx/in-platformconfigdir, config/rauc/rauc.key.pem)"; \
> +		test ! -e "$${keyfile}" || \
> +		ptxd_bailout "Legacy RAUC keyring exists at $${keyfile}!" \
> +			"Please use the signing provider infrastructure instead, as described in:" \
>  			"https://www.ptxdist.org/doc/dev_code_signing.html"
>  	@$(call world/prepare, RAUC)
>  	@$(call touch)

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de