Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 01/10] dtc: upgrade to 1.4.6
Date: Thu, 17 May 2018 14:38:28 +0300	[thread overview]
Message-ID: <20180517113837.24240-1-alexander.kanavin@linux.intel.com> (raw)

Drop upstreamed patch.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-kernel/dtc/dtc.inc               |  1 -
 ...se-proper-format-modifier-for-size_t.patch | 43 -------------------
 .../dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb}        |  2 +-
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
 rename meta/recipes-kernel/dtc/{dtc_1.4.5.bb => dtc_1.4.6.bb} (81%)

diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 9a90d440416..7a923bf5206 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
            file://make_install.patch \
-           file://0001-checks-Use-proper-format-modifier-for-size_t.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch b/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
deleted file mode 100644
index cab384dd99a..00000000000
--- a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001
-From: Thierry Reding <treding@nvidia.com>
-Date: Wed, 27 Sep 2017 15:04:09 +0200
-Subject: [PATCH] checks: Use proper format modifier for size_t
-
-The size of size_t can vary between architectures, so using %ld isn't
-going to work on 32-bit builds. Use the %zu modifier to make sure it is
-always correct.
-
-Upstream-Status: Backport
-Signed-off-by: Thierry Reding <treding@nvidia.com>
-Acked-by: Rob Herring <robh@kernel.org>
-Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-Signed-off-by: Alexander Kanavin <alex.kanavin@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.15.0
-
diff --git a/meta/recipes-kernel/dtc/dtc_1.4.5.bb b/meta/recipes-kernel/dtc/dtc_1.4.6.bb
similarity index 81%
rename from meta/recipes-kernel/dtc/dtc_1.4.5.bb
rename to meta/recipes-kernel/dtc/dtc_1.4.6.bb
index 0e46cfbeb4f..78c57363926 100644
--- a/meta/recipes-kernel/dtc/dtc_1.4.5.bb
+++ b/meta/recipes-kernel/dtc/dtc_1.4.6.bb
@@ -3,7 +3,7 @@ require dtc.inc
 LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
 		    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
 
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
+SRCREV = "e54388015af1fb4bf04d0bca99caba1074d9cc42"
 
 S = "${WORKDIR}/git"
 
-- 
2.17.0



             reply	other threads:[~2018-05-17 11:46 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-17 11:38 Alexander Kanavin [this message]
2018-05-17 11:38 ` [PATCH 02/10] xz: fix upstream version check Alexander Kanavin
2018-05-17 11:38 ` [PATCH 03/10] babeltrace: " Alexander Kanavin
2018-05-17 11:38 ` [PATCH 04/10] gnome-desktop3: remove the recipe Alexander Kanavin
2018-05-17 11:38 ` [PATCH 05/10] libidn: upgrade 1.34 -> 1.35 Alexander Kanavin
2018-05-17 11:38 ` [PATCH 06/10] btrfs-tools: upgrade 4.15.1 -> 4.16.1 Alexander Kanavin
2018-05-23 14:01   ` Burton, Ross
2018-05-17 11:38 ` [PATCH 07/10] rt-tests: fix upstream version check Alexander Kanavin
2018-05-17 11:38 ` [PATCH 08/10] openssl: fix upstream version check for 1.0 version Alexander Kanavin
2018-05-17 11:38 ` [PATCH 09/10] meson: update to 0.46.1 Alexander Kanavin
2018-05-17 11:38 ` [PATCH 10/10] qemuwrapper-cross: always fall back to x86_64 and i386 variants of qemu Alexander Kanavin

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=20180517113837.24240-1-alexander.kanavin@linux.intel.com \
    --to=alexander.kanavin@linux.intel.com \
    --cc=openembedded-core@lists.openembedded.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox