All of lore.kernel.org
 help / color / mirror / Atom feed
From: Khem Raj <raj.khem@gmail.com>
To: meta-freescale@yoctoproject.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [PATCH] dtc-145: Fix compile failure with latest master on musl
Date: Sat,  6 Oct 2018 18:23:46 -0700	[thread overview]
Message-ID: <20181007012346.27360-1-raj.khem@gmail.com> (raw)

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



                 reply	other threads:[~2018-10-07  1:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181007012346.27360-1-raj.khem@gmail.com \
    --to=raj.khem@gmail.com \
    --cc=meta-freescale@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.