[Buildroot] [git commit] uboot: use local libfdt.h

[Buildroot] [git commit] uboot: use local libfdt.h

[Peter Korsgaard]

commit: https://git.buildroot.net/buildroot/commit/?id=3a6573ccee2624de0c604abf2c7df6704a4cf566
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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>
---
 boot/uboot/uboot.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index fdacf16..a1fac7d 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) 	\

[Buildroot] [git commit] uboot: use local libfdt.h

[Arnout Vandecappelle]

On 06-11-17 21:25, Peter Korsgaard wrote:
> +define UBOOT_FIX_LIBFDT_SYSTEM_PATH
> +	[ ! -e $(@D)/tools/fdtgrep.c ] || \

 Is there any reason to use [ ! ... ] || instead of [ ... ] && ?

 Regards,
 Arnout

> +	$(SED) 's%<../include/libfdt.h>%"../include/libfdt.h"%' $(@D)/tools/fdtgrep.c
> +endef

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

[Buildroot] [git commit] uboot: use local libfdt.h

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 06-11-17 21:25, Peter Korsgaard wrote:
 >> +define UBOOT_FIX_LIBFDT_SYSTEM_PATH
 >> +	[ ! -e $(@D)/tools/fdtgrep.c ] || \

 >  Is there any reason to use [ ! ... ] || instead of [ ... ] && ?

You would need to add .. || true to not exit with a non-zero exit code
if the file doesn't exist (and stop make), so doing it like this is
shorter.

-- 
Bye, Peter Korsgaard