diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2018-02-16 11:40:34 +0100 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2018-02-16 12:17:15 +0100 |
| commit | 94ef87f49dbada855ce9b2a00b2bd62ffa509336 (patch) | |
| tree | 3603204ad906a5aeeea268dab416135fe4d3aa96 /package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch | |
| parent | 4bc1ebbd88a2aef177a7d4c36c8cd5fbf7cf0bd0 (diff) | |
| download | upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.tar.gz upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.tar.bz2 upstream-94ef87f49dbada855ce9b2a00b2bd62ffa509336.zip | |
Revert "uboot-sunxi: bump to 2017.11"
This reverts commit 805f756d6e4ff5061380baf5e262aec72abcf195.
Move back to 2017.07 until we move sunxi to GCC7.
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch')
| -rw-r--r-- | package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch b/package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch new file mode 100644 index 0000000000..1a5603417a --- /dev/null +++ b/package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch @@ -0,0 +1,21 @@ +From 53d123333fa0ddc64b2c55d48366f4582ac6922d Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Thu, 20 Jul 2017 19:50:52 +0200 +Subject: [PATCH 212/213] Revert "Avoid non-portable sed construct" + +This reverts commit 208db781cad4c24f538658a9cb17e24fa43ca3c9. +--- + scripts/Makefile.lib | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -309,7 +309,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 '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \ ++ | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%') | \ + $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ + $(DTC) -O dtb -o $@ -b 0 \ + -i $(dir $<) $(DTC_FLAGS) \ |