diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-20 23:27:31 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-09-18 18:36:26 +0200 |
| commit | b9a35920bf45c3dfa950acdd187dcb5f80341e69 (patch) | |
| tree | 7af4e10e9e737f9450ff40b53d843b1221050bd7 /package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch | |
| parent | 85b7d780c58b586f2f6c01637efda45d4d77b1ac (diff) | |
| download | upstream-b9a35920bf45c3dfa950acdd187dcb5f80341e69.tar.gz upstream-b9a35920bf45c3dfa950acdd187dcb5f80341e69.tar.bz2 upstream-b9a35920bf45c3dfa950acdd187dcb5f80341e69.zip | |
uboot-sunxi: revert the usage of binman
This will avoid the usage of swig.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 26 |
1 files changed, 26 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..1633ec718b --- /dev/null +++ b/package/boot/uboot-sunxi/patches/212-Revert-Avoid-non-portable-sed-construct.patch @@ -0,0 +1,26 @@ +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(-) + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 66f8dcbe07..54bcb166b0 100644 +--- 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) \ +-- +2.11.0 + |