212-Revert-Avoid-non-portable-sed-construct.patch 963 B

1234567891011121314151617181920212223242526
  1. From 53d123333fa0ddc64b2c55d48366f4582ac6922d Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <[email protected]>
  3. Date: Thu, 20 Jul 2017 19:50:52 +0200
  4. Subject: [PATCH 212/213] Revert "Avoid non-portable sed construct"
  5. This reverts commit 208db781cad4c24f538658a9cb17e24fa43ca3c9.
  6. ---
  7. scripts/Makefile.lib | 2 +-
  8. 1 file changed, 1 insertion(+), 1 deletion(-)
  9. diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
  10. index 66f8dcbe07..54bcb166b0 100644
  11. --- a/scripts/Makefile.lib
  12. +++ b/scripts/Makefile.lib
  13. @@ -309,7 +309,7 @@ quiet_cmd_dtc = DTC $@
  14. # Bring in any U-Boot-specific include after the '/dts-v1/;' header
  15. cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
  16. cat $< $(if $(u_boot_dtsi),\
  17. - | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \
  18. + | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \
  19. $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
  20. $(DTC) -O dtb -o $@ -b 0 \
  21. -i $(dir $<) $(DTC_FLAGS) \
  22. --
  23. 2.11.0