Date: Sat, 13 Feb 2021 11:06:32 +0100 From: Roger Pau Monne <royger@FreeBSD.org> To: u-boot@lists.denx.de Cc: uboot@freebsd.org, Roger Pau Monne <royger@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: [PATCH 2/2] build/DTC: fix sed usage in DTC command Message-ID: <20210213100632.6249-3-royger@FreeBSD.org> In-Reply-To: <20210213100632.6249-1-royger@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
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
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210213100632.6249-3-royger>