Date: Sat, 13 Feb 2021 09:43:51 -0700 From: Warner Losh <imp@bsdimp.com> To: Roger Pau Monne <royger@freebsd.org> Cc: U-Boot Mailing List <u-boot@lists.denx.de>, 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: <CANCZdfqAbFpiSbZt5VqESgqk71aVMXSTkCSKoME=DKADZQzgGg@mail.gmail.com> In-Reply-To: <20210213100632.6249-3-royger@FreeBSD.org> References: <20210213100632.6249-1-royger@FreeBSD.org> <20210213100632.6249-3-royger@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
On Sat, Feb 13, 2021 at 3:06 AM Roger Pau Monne <royger@freebsd.org> 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>
>
Reviewed by: Warner Losh <imp@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
>
> _______________________________________________
> freebsd-uboot@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-uboot
> To unsubscribe, send any mail to "freebsd-uboot-unsubscribe@freebsd.org"
>
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqAbFpiSbZt5VqESgqk71aVMXSTkCSKoME=DKADZQzgGg>