From owner-freebsd-uboot@freebsd.org  Mon Feb 22 09:17:09 2021
Return-Path: <owner-freebsd-uboot@freebsd.org>
Delivered-To: freebsd-uboot@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE0AB54EF22
 for <freebsd-uboot@mailman.nyi.freebsd.org>;
 Mon, 22 Feb 2021 09:17:09 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3])
 by mx1.freebsd.org (Postfix) with ESMTP id 4Dkc5K5S1mz4sBs
 for <freebsd-uboot@freebsd.org>; Mon, 22 Feb 2021 09:17:09 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: by mailman.nyi.freebsd.org (Postfix)
 id B93B754EF21; Mon, 22 Feb 2021 09:17:09 +0000 (UTC)
Delivered-To: uboot@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id B904354ED4C
 for <uboot@mailman.nyi.freebsd.org>; Mon, 22 Feb 2021 09:17:09 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Dkc5K4drfz4rl1;
 Mon, 22 Feb 2021 09:17:09 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Received: from localhost (unknown [212.230.157.163])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate) (Authenticated sender: royger)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 3D32320F49;
 Mon, 22 Feb 2021 09:17:09 +0000 (UTC)
 (envelope-from royger@FreeBSD.org)
Date: Mon, 22 Feb 2021 10:17:07 +0100
From: Roger Pau =?utf-8?B?TW9ubsOp?= <royger@FreeBSD.org>
To: u-boot@lists.denx.de
Cc: uboot@freebsd.org, Masahiro Yamada <masahiroy@kernel.org>,
 Simon Glass <sjg@chromium.org>, Michal Simek <michal.simek@xilinx.com>,
 Wolfgang Wallner <wolfgang.wallner@br-automation.com>,
 Jan Kiszka <jan.kiszka@siemens.com>
Subject: Re: [PATCH 2/2] build/DTC: fix sed usage in DTC command
Message-ID: <YDN2k4KHLz5EuPnJ@Air-de-Roger>
References: <20210213100632.6249-1-royger@FreeBSD.org>
 <20210213100632.6249-3-royger@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20210213100632.6249-3-royger@FreeBSD.org>
X-BeenThere: freebsd-uboot@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Discussions about the use of uboot with FreeBSD
 <freebsd-uboot.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-uboot>,
 <mailto:freebsd-uboot-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-uboot/>
List-Post: <mailto:freebsd-uboot@freebsd.org>
List-Help: <mailto:freebsd-uboot-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-uboot>,
 <mailto:freebsd-uboot-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2021 09:17:09 -0000

Ping?

On Sat, Feb 13, 2021 at 11:06:32AM +0100, Roger Pau Monne wrote:
> Current sed usage in the DTC command relies on GNU sed specific -i
> option which has a slightly different syntax for BSD sed and always
> expects an extension to be provided in order to create a backup file.
> 
> Instead drop the cat concatenation done before the sed call and use
> sed itself to edit and concatenate the files.
> 
> No functional change intended.
> 
> Signed-off-by: Roger Pau Monné <royger@FreeBSD.org>
> ---
> Cc: Masahiro Yamada <masahiroy@kernel.org>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Michal Simek <michal.simek@xilinx.com>
> Cc: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
> Cc: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  scripts/Makefile.lib | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 56e9d54242..78543c6dd1 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -326,8 +326,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
>  		-d $(depfile).dtc.tmp $(dtc-tmp) || \
>  		(echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \
>  		; \
> -	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) ; \
> -	sed -i "s:$(pre-tmp):$(<):" $(depfile)
> +	sed "s:$(pre-tmp):$(<):" $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
>  
>  $(obj)/%.dtb: $(src)/%.dts FORCE
>  	$(call if_changed_dep,dtc)
> -- 
> 2.30.1
>