| Message ID | 20170108181127.55124-1-kettenis@openbsd.org |
|---|---|
| State | Accepted |
| Commit | 208db781cad4c24f538658a9cb17e24fa43ca3c9 |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Jan 08, 2017 at 07:11:27PM +0100, Mark Kettenis wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 13c975b8a4..4413e9f98b 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) \
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> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)