summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRoger Pau Monne <royger@FreeBSD.org>2021-02-13 11:06:32 +0100
committerTom Rini <trini@konsulko.com>2021-02-24 16:51:48 -0500
commite420a38fa69b2d528466a4b6d40deb1fb58ea352 (patch)
tree5611ed51cb4c935b08c63f5a5896bbcde89ef8e0 /scripts
parent99078472455b8bb69ce57237bcc68ea9ac88ae38 (diff)
downloadu-boot-e420a38fa69b2d528466a4b6d40deb1fb58ea352.tar.gz
u-boot-e420a38fa69b2d528466a4b6d40deb1fb58ea352.tar.xz
u-boot-e420a38fa69b2d528466a4b6d40deb1fb58ea352.zip
build/DTC: fix sed usage in DTC command
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib3
1 files changed, 1 insertions, 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)