aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Matt Weber <matthew.weber@rockwellcollins.com>2017-11-06 06:13:27 -0600
committerGravatar Peter Korsgaard <peter@korsgaard.com>2017-11-06 21:25:31 +0100
commit3a6573ccee2624de0c604abf2c7df6704a4cf566 (patch)
tree8630455b6be9e356b0239f21f3a730e1b8e51f15
parent3a965d628a557530b78c40d5ed53e3c8ae38de4f (diff)
downloadbuildroot-3a6573ccee2624de0c604abf2c7df6704a4cf566.tar.gz
buildroot-3a6573ccee2624de0c604abf2c7df6704a4cf566.tar.bz2
uboot: use local libfdt.h
Use of libfdt.h by u-boot is currently using the <system-path>. Jan submitted the following upstream https://patchwork.ozlabs.org/patch/833760/ Resolves a failure like this one observed on uboot-tools http://autobuild.buildroot.net/results/347cde4b5c0e6ca76d354396385be4ec1294da73 [Peter: only sed if file exists] CC: Jan Kundrát <jan.kundrat@cesnet.cz> CC: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--boot/uboot/uboot.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index fdacf16856..a1fac7dcae 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -183,6 +183,13 @@ define UBOOT_APPLY_LOCAL_PATCHES
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES
+# Bug: https://patchwork.ozlabs.org/patch/833760/
+define UBOOT_FIX_LIBFDT_SYSTEM_PATH
+ [ ! -e $(@D)/tools/fdtgrep.c ] || \
+ $(SED) 's%<../include/libfdt.h>%"../include/libfdt.h"%' $(@D)/tools/fdtgrep.c
+endef
+UBOOT_POST_PATCH_HOOKS += UBOOT_FIX_LIBFDT_SYSTEM_PATH
+
ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
define UBOOT_CONFIGURE_CMDS
$(TARGET_CONFIGURE_OPTS) \