[Buildroot] [PATCH 1/2] uboot: use local libfdt.h

[Buildroot] [PATCH 1/2] uboot: use local libfdt.h

[Matt Weber]

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

CC: Jan Kundr?t <jan.kundrat@cesnet.cz>
CC: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
---
 boot/uboot/uboot.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index fdacf16856..3350814a82 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -183,6 +183,12 @@ 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
+	$(SED) 's%<../include/libfdt.h>%"../include/libfdt.h"%' $(@D)/tools/fdtgrep.c 2> /dev/null
+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) 	\
-- 
2.14.2

[Buildroot] [PATCH 2/2] uboot-tools: use local libfdt.h

[Matt Weber]

The use of libfdt.h by u-boot is using the
<system-path>.  The libfdt part of uboot
is expriencing a lot of change and this patch
should be overcome by events post uboot-2017.11
release.

Jan submitted the following upstream
https://patchwork.ozlabs.org/patch/833760/

Resolves:
http://autobuild.buildroot.net/results/347cde4b5c0e6ca76d354396385be4ec1294da73
http://autobuild.buildroot.net/results/2b429f82bed1f03d69021e0f959da4e2db2b5a0b
http://autobuild.buildroot.net/results/b18012963926682ba192b9176bd3e35fb07cdf56

CC: Jan Kundr?t <jan.kundrat@cesnet.cz>
CC: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
---
 ...-not-attempt-to-use-the-systemwide-libfdt.patch | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch

diff --git a/package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch b/package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch
new file mode 100644
index 0000000000..abeef65929
--- /dev/null
+++ b/package/uboot-tools/0005-Do-not-attempt-to-use-the-systemwide-libfdt.patch
@@ -0,0 +1,56 @@
+From 477ecb8d9ffa7b90d8bec0d8317b7e464e906f7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jan.kundrat@cesnet.cz>
+Date: Fri, 3 Nov 2017 03:06:35 +0100
+Subject: [PATCH] Do not attempt to use the systemwide libfdt
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+U-Boot bundles a patched copy of libfdt, so it's wrong to attempt to
+include it <like/this>. This breaks the build for me when I have dtc
+fully installed in my host -- as happened earlier tonight with
+Buildroot, for example.
+
+There are several other occurrences throughout the code where '<libfdt'
+matches. I'm not modifying these because I have no clue why the
+<systemwide> include style is being used -- IMHO wrongly.
+
+Signed-off-by: Jan Kundr?t <jan.kundrat@cesnet.cz>
+---
+ include/fdt.h    | 2 +-
+ include/libfdt.h | 2 +-
+ tools/fdtgrep.c  | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/fdt.h b/include/fdt.h
+index 7ead62e..f40b56c 100644
+--- a/include/fdt.h
++++ b/include/fdt.h
+@@ -1 +1 @@
+-#include <../lib/libfdt/fdt.h>
++#include "../lib/libfdt/fdt.h"
+diff --git a/include/libfdt.h b/include/libfdt.h
+index 10296a2..7ba13e6 100644
+--- a/include/libfdt.h
++++ b/include/libfdt.h
+@@ -1 +1 @@
+-#include <../lib/libfdt/libfdt.h>
++#include "../lib/libfdt/libfdt.h"
+diff --git a/tools/fdtgrep.c b/tools/fdtgrep.c
+index f51f5f1..5897b6d 100644
+--- a/tools/fdtgrep.c
++++ b/tools/fdtgrep.c
+@@ -16,8 +16,8 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#include <../include/libfdt.h>
+-#include <libfdt_internal.h>
++#include "../include/libfdt.h"
++#include "libfdt_internal.h"
+ 
+ /* Define DEBUG to get some debugging output on stderr */
+ #ifdef DEBUG
+-- 
+2.14.2
+
-- 
2.14.2

[Buildroot] [PATCH 2/2] uboot-tools: use local libfdt.h

[Peter Korsgaard]

>>>>> "Matt" == Matt Weber <matthew.weber@rockwellcollins.com> writes:

 > The use of libfdt.h by u-boot is using the
 > <system-path>.  The libfdt part of uboot
 > is expriencing a lot of change and this patch
 > should be overcome by events post uboot-2017.11
 > release.

 > Jan submitted the following upstream
 > https://patchwork.ozlabs.org/patch/833760/

 > Resolves:
 > http://autobuild.buildroot.net/results/347cde4b5c0e6ca76d354396385be4ec1294da73
 > http://autobuild.buildroot.net/results/2b429f82bed1f03d69021e0f959da4e2db2b5a0b
 > http://autobuild.buildroot.net/results/b18012963926682ba192b9176bd3e35fb07cdf56

 > CC: Jan Kundr?t <jan.kundrat@cesnet.cz>
 > CC: Arnout Vandecappelle <arnout@mind.be>
 > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] uboot: use local libfdt.h

[Matthew Weber]

All,

On Mon, Nov 6, 2017 at 6:13 AM, Matt Weber
<matthew.weber@rockwellcollins.com> wrote:
> 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
>
> CC: Jan Kundr?t <jan.kundrat@cesnet.cz>
> CC: Arnout Vandecappelle <arnout@mind.be>
> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
> ---
>  boot/uboot/uboot.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index fdacf16856..3350814a82 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -183,6 +183,12 @@ 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
> +       $(SED) 's%<../include/libfdt.h>%"../include/libfdt.h"%' $(@D)/tools/fdtgrep.c 2> /dev/null


Found a bug, I need to go back and test again with an older uboot.  I
thought I had but it looks like it errors out even with the re-direct.

Matt

[Buildroot] [PATCH 1/2] uboot: use local libfdt.h

[Peter Korsgaard]

>>>>> "Matthew" == Matthew Weber <matthew.weber@rockwellcollins.com> writes:

 > All,
 > On Mon, Nov 6, 2017 at 6:13 AM, Matt Weber
 > <matthew.weber@rockwellcollins.com> wrote:
 >> 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
 >> 
 >> CC: Jan Kundr?t <jan.kundrat@cesnet.cz>
 >> CC: Arnout Vandecappelle <arnout@mind.be>
 >> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
 >> ---
 >> boot/uboot/uboot.mk | 6 ++++++
 >> 1 file changed, 6 insertions(+)
 >> 
 >> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
 >> index fdacf16856..3350814a82 100644
 >> --- a/boot/uboot/uboot.mk
 >> +++ b/boot/uboot/uboot.mk
 >> @@ -183,6 +183,12 @@ 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
 >> +       $(SED) 's%<../include/libfdt.h>%"../include/libfdt.h"%' $(@D)/tools/fdtgrep.c 2> /dev/null


 > Found a bug, I need to go back and test again with an older uboot.  I
 > thought I had but it looks like it errors out even with the re-direct.

I reworked it to only run sed if fdtgrep.c exists and applied, thanks.

-- 
Bye, Peter Korsgaard