diff options
authorGravatar Lothar Felten <lothar.felten@gmail.com>2018-10-08 13:51:46 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-10-20 12:35:03 +0100
commitc7ffd8a75d55e24d793106eabbb80964ab91081f (patch)
parent963f824511b68104469cfda6d8874df0651ed9bb (diff)
package/dtc: fix include guards for older kernel/u-boot
U-Boot has a copy of dtc in-tree. However, it has a bug in its build system which could result in both one of the in-tree dtc include files and the same host-installed include file to be #included. Normally, that wouldn't be a problem, because (a) the two include files are compatible, so it doesn't matter which one you include, and (b) the include guards are the same in both, so only one of them really does get included. However, upstream dtc has changed the include guards, removing the leading underscore. Therefore, now the header file does get included twice, which leads to multiple definitions like: /builds/buildroot.org/buildroot/output/host/include/libfdt.h:1790:19: error: redefinition of 'fdt_appendprop_cell' static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, ^~~~~~~~~~~~~~~~~~~ In file included from tools/fdt_host.h:11:0, from tools/imagetool.h:24, from tools/atmelimage.c:8: tools/../include/libfdt.h:1656:19: note: previous definition of 'fdt_appendprop_cell' was here static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, ^~~~~~~~~~~~~~~~~~~ To fix this, patch (host) dtc to accept the old include guard as well, which restores the old behaviour. This patch is probably not upstreamable, since it's really a hack to work around an issue in U-Boot. Note that it has been fixed upstream, but Buildroot supports building older versions of U-Boot as well. Note that the problem may still occur if you have libdtc-dev installed on the host. However, now there is a simple workaround: enable BR2_TARGET_UBOOT_NEEDS_DTC. Note that a similar problem also occurs with the beaglebone fork of the kernel. It's not clear if it has been fixed there. Signed-off-by: Lothar Felten <lothar.felten@gmail.com> [Arnout: rewrite commit message, rewrap patch commit message] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
1 files changed, 46 insertions, 0 deletions
diff --git a/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch
new file mode 100644
index 0000000000..e4e49bf6e4
--- /dev/null
+++ b/package/dtc/0001-Fix-include-guards-for-older-kernel-u-boot-sources.patch
@@ -0,0 +1,46 @@
+From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001
+From: Lothar Felten <lothar.felten@gmail.com>
+Date: Mon, 8 Oct 2018 13:29:44 +0200
+Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources
+Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt
+include guards with leading underscores.
+Those have been removed in dtc-1.4.7.
+This patch handles both include guard types and allows the compilation
+of older Linux kernel and u-boot sources.
+Signed-off-by: Lothar Felten <lothar.felten@gmail.com>
+ libfdt/libfdt.h | 4 ++++
+ libfdt/libfdt_env.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
+index 830b77e..bef4566 100644
+--- a/libfdt/libfdt.h
++++ b/libfdt/libfdt.h
+@@ -1,3 +1,7 @@
++#ifdef _LIBFDT_H
++#warning "Please consider updating your kernel and/or u-boot version"
++#define LIBFDT_H
+ #ifndef LIBFDT_H
+ #define LIBFDT_H
+ /*
+diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
+index eb20538..6a61e6a 100644
+--- a/libfdt/libfdt_env.h
++++ b/libfdt/libfdt_env.h
+@@ -1,3 +1,7 @@
++#ifdef _LIBFDT_ENV_H
++#warning "Please consider updating your kernel and/or u-boot version"
++#define LIBFDT_ENV_H
+ #ifndef LIBFDT_ENV_H
+ #define LIBFDT_ENV_H
+ /*