* [PATCH] dtc-145: Fix compile failure with latest master on musl
@ 2018-10-07 1:23 Khem Raj
0 siblings, 0 replies; only message in thread
From: Khem Raj @ 2018-10-07 1:23 UTC (permalink / raw)
To: meta-freescale; +Cc: Khem Raj
This issue is primarily seen when building the target recipe on musl the
fix is a partial backport from upstream to get over the hump
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes-kernel/dtc/dtc-145_git.bb | 6 +-
...Fix-compiler-warnings-seen-with-musl.patch | 55 +++++++++++++++++++
2 files changed, 59 insertions(+), 2 deletions(-)
create mode 100644 recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch
diff --git a/recipes-kernel/dtc/dtc-145_git.bb b/recipes-kernel/dtc/dtc-145_git.bb
index 2776cc5e..2d4097bb 100644
--- a/recipes-kernel/dtc/dtc-145_git.bb
+++ b/recipes-kernel/dtc/dtc-145_git.bb
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = " \
SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+SRC_URI += "file://0001-Fix-compiler-warnings-seen-with-musl.patch \
+ "
S = "${WORKDIR}/git"
-BBCLASSEXTEND = "native nativesdk"
-
# only install the dtc binary renamed to dtc-145
do_install () {
install -d ${D}/${bindir}
install -m 755 dtc ${D}/${bindir}/dtc-145
}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch b/recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch
new file mode 100644
index 00000000..418a6498
--- /dev/null
+++ b/recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch
@@ -0,0 +1,55 @@
+From 50034ca2600ae07203f397af6d78e2e9ff16bc02 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Oct 2018 18:12:23 -0700
+Subject: [PATCH] Fix compiler warnings seen with musl
+
+Fixes
+
+checks.c:975:16: error: format '%ld' expects argument of type 'long
+int', but argument 6 has type 'unsigned int' [-Werror=format=]
+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple
+of %ld in node %s",
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+ ~~~~~~~~~~~~~~
+checks.c:96:23: note: in definition of macro 'FAIL'
+ check_msg((c), dti, __VA_ARGS__); \
+ ^~~~~~~~~~~
+checks.c: In function 'check_interrupts_property':
+checks.c:1166:16: error: format '%ld' expects argument of type 'long
+int', but argument 6 has type 'unsigned int' [-Werror=format=]
+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple
+of %ld in node %s",
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+ ~~~~~~~~~~~~~~
+
+Upstream-Status: Backport [adapted from an upstream fix]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ checks.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/checks.c b/checks.c
+index 902f2e3..08a3a29 100644
+--- a/checks.c
++++ b/checks.c
+@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c,
+ int cell, cellsize = 0;
+
+ if (prop->val.len % sizeof(cell_t)) {
+- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+ return;
+ }
+@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c,
+ return;
+
+ if (irq_prop->val.len % sizeof(cell_t))
+- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
++ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+ irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+ node->fullpath);
+
--
2.19.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-10-07 1:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-07 1:23 [PATCH] dtc-145: Fix compile failure with latest master on musl Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.