From: Mark Kettenis <kettenis@openbsd.org>
Date: Sun, 8 Jan 2017 18:11:27 +0000 (+0100)
Subject: Avoid non-portable sed construct
X-Git-Tag: v2017.03-rc1~108
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=208db781cad4c24f538658a9cb17e24fa43ca3c9;p=oweals%2Fu-boot.git

Avoid non-portable sed construct

Using \n in a substitution is a GNU extension.  Use the 'G" command instead
to insert the desired line.

Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
---

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 81ac7eb12c..23be324369 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -311,7 +311,7 @@ quiet_cmd_dtc = DTC     $@
 # Bring in any U-Boot-specific include after the '/dts-v1/;' header
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
 	cat $< $(if $(u_boot_dtsi),\
-		| sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%')  | \
+		| sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \
 		$(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
 	$(DTC) -O dtb -o $@ -b 0 \
 		-i $(dir $<) $(DTC_FLAGS) \