<div dir="ltr">This breaks u-boot builds:<div><br></div><div><div>| /data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/recipe-sysroot-native/usr/include/libfdt_env.h:70:30: error: conflicting types for 'fdt64_t'</div><div>| typedef uint64_t FDT_BITWISE fdt64_t;</div><div>| ^~~~~~~</div><div>| In file included from <command-line>:0:0:</div><div>| /data/poky-tmp/master/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/1_2018.01-r0/git/include/libfdt_env.h:19:16: note: previous declaration of 'fdt64_t' was here</div><div>| typedef __be64 fdt64_t;</div><div>| ^~~~~~~</div></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 1 February 2018 at 18:02, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Drop upstreamed patch.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com">alexander.kanavin@linux.<wbr>intel.com</a>><br>
---<br>
meta/recipes-kernel/dtc/dtc.<wbr>inc | 1 -<br>
...cks-Use-proper-format-<wbr>modifier-for-size_t.patch | 43 ----------------------<br>
.../dtc/{<a href="http://dtc_1.4.5.bb" rel="noreferrer" target="_blank">dtc_1.4.5.bb</a> => <a href="http://dtc_1.4.6.bb" rel="noreferrer" target="_blank">dtc_1.4.6.bb</a>} | 2 +-<br>
3 files changed, 1 insertion(+), 45 deletions(-)<br>
delete mode 100644 meta/recipes-kernel/dtc/dtc/<wbr>0001-checks-Use-proper-format-<wbr>modifier-for-size_t.patch<br>
rename meta/recipes-kernel/dtc/{<a href="http://dtc_1.4.5.bb" rel="noreferrer" target="_blank">dtc_<wbr>1.4.5.bb</a> => <a href="http://dtc_1.4.6.bb" rel="noreferrer" target="_blank">dtc_1.4.6.bb</a>} (81%)<br>
<br>
diff --git a/meta/recipes-kernel/dtc/dtc.<wbr>inc b/meta/recipes-kernel/dtc/dtc.<wbr>inc<br>
index d259c57e8d9..925cca92fac 100644<br>
--- a/meta/recipes-kernel/dtc/dtc.<wbr>inc<br>
+++ b/meta/recipes-kernel/dtc/dtc.<wbr>inc<br>
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"<br>
<br>
SRC_URI = "git://<a href="http://git.kernel.org/pub/scm/utils/dtc/dtc.git" rel="noreferrer" target="_blank">git.kernel.org/pub/scm/<wbr>utils/dtc/dtc.git</a> \<br>
file://make_install.patch \<br>
- file://0001-checks-Use-proper-<wbr>format-modifier-for-size_t.<wbr>patch \<br>
"<br>
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"<br>
<br>
diff --git a/meta/recipes-kernel/dtc/dtc/<wbr>0001-checks-Use-proper-format-<wbr>modifier-for-size_t.patch b/meta/recipes-kernel/dtc/dtc/<wbr>0001-checks-Use-proper-format-<wbr>modifier-for-size_t.patch<br>
deleted file mode 100644<br>
index cab384dd99a..00000000000<br>
--- a/meta/recipes-kernel/dtc/dtc/<wbr>0001-checks-Use-proper-format-<wbr>modifier-for-size_t.patch<br>
+++ /dev/null<br>
@@ -1,43 +0,0 @@<br>
-From c7a4c3817796107bb824a1f173faf9<wbr>0fae45396b Mon Sep 17 00:00:00 2001<br>
-From: Thierry Reding <<a href="mailto:treding@nvidia.com">treding@nvidia.com</a>><br>
-Date: Wed, 27 Sep 2017 15:04:09 +0200<br>
-Subject: [PATCH] checks: Use proper format modifier for size_t<br>
-<br>
-The size of size_t can vary between architectures, so using %ld isn't<br>
-going to work on 32-bit builds. Use the %zu modifier to make sure it is<br>
-always correct.<br>
-<br>
-Upstream-Status: Backport<br>
-Signed-off-by: Thierry Reding <<a href="mailto:treding@nvidia.com">treding@nvidia.com</a>><br>
-Acked-by: Rob Herring <<a href="mailto:robh@kernel.org">robh@kernel.org</a>><br>
-Signed-off-by: David Gibson <<a href="mailto:david@gibson.dropbear.id.au">david@gibson.dropbear.id.au</a>><br>
-Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
----<br>
- checks.c | 4 ++--<br>
- 1 file changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/checks.c b/checks.c<br>
-index 902f2e3..08a3a29 100644<br>
---- a/checks.c<br>
-+++ b/checks.c<br>
-@@ -972,7 +972,7 @@ static void check_property_phandle_args(<wbr>struct check *c,<br>
- int cell, cellsize = 0;<br>
-<br>
- if (prop->val.len % sizeof(cell_t)) {<br>
-- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",<br>
-+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",<br>
- prop->name, prop->val.len, sizeof(cell_t), node->fullpath);<br>
- return;<br>
- }<br>
-@@ -1163,7 +1163,7 @@ static void check_interrupts_property(<wbr>struct check *c,<br>
- return;<br>
-<br>
- if (irq_prop->val.len % sizeof(cell_t))<br>
-- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",<br>
-+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",<br>
- irq_prop->name, irq_prop->val.len, sizeof(cell_t),<br>
- node->fullpath);<br>
-<br>
---<br>
-2.15.0<br>
-<br>
diff --git a/meta/recipes-kernel/dtc/<a href="http://dtc_1.4.5.bb" rel="noreferrer" target="_blank">dtc_<wbr>1.4.5.bb</a> b/meta/recipes-kernel/dtc/<a href="http://dtc_1.4.6.bb" rel="noreferrer" target="_blank">dtc_<wbr>1.4.6.bb</a><br>
similarity index 81%<br>
rename from meta/recipes-kernel/dtc/<a href="http://dtc_1.4.5.bb" rel="noreferrer" target="_blank">dtc_1.<wbr>4.5.bb</a><br>
rename to meta/recipes-kernel/dtc/<a href="http://dtc_1.4.6.bb" rel="noreferrer" target="_blank">dtc_1.<wbr>4.6.bb</a><br>
index 0e46cfbeb4f..78c57363926 100644<br>
--- a/meta/recipes-kernel/dtc/<a href="http://dtc_1.4.5.bb" rel="noreferrer" target="_blank">dtc_<wbr>1.4.5.bb</a><br>
+++ b/meta/recipes-kernel/dtc/<a href="http://dtc_1.4.6.bb" rel="noreferrer" target="_blank">dtc_<wbr>1.4.6.bb</a><br>
@@ -3,7 +3,7 @@ require dtc.inc<br>
LIC_FILES_CHKSUM = "file://GPL;md5=<wbr>94d55d512a9ba36caa9b7df079bae1<wbr>9f \<br>
file://libfdt/libfdt.h;<wbr>beginline=3;endline=52;md5=<wbr>fb360963151f8ec2d6c06b055bcbb6<wbr>8c"<br>
<br>
-SRCREV = "<wbr>22a65c5331c22979d416738eb756b9<wbr>541672e00d"<br>
+SRCREV = "<wbr>e54388015af1fb4bf04d0bca99caba<wbr>1074d9cc42"<br>
<br>
S = "${WORKDIR}/git"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.15.1<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>